summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--enc/euc_cn.c12
-rw-r--r--enc/euc_kr.c1
-rw-r--r--enc/gb2312.c12
4 files changed, 18 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 8401b10d5c..d2a5cb140b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@ Tue Jan 29 12:53:39 2008 NARUSE, Yui <naruse@ruby-lang.org>
* enc/gbk.c: add GBK, CP936 and CP949.
+ * enc/euc_kr.c: remove CP949.
+
+ * enc/euc_cn.c: remove CP936 and rename to gb2312.c
+
+ * enc/gb2312.c: GB2312 is preferred MIME name.
+
Tue Jan 29 03:01:29 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* parse.y (reg_fragment_setenc_gen): US-ASCII script special code.
diff --git a/enc/euc_cn.c b/enc/euc_cn.c
deleted file mode 100644
index c30f4aa847..0000000000
--- a/enc/euc_cn.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <ruby/ruby.h>
-#include <ruby/encoding.h>
-#include "regenc.h"
-
-void
-Init_euc_cn(void)
-{
- rb_enc_register("EUC-CN", rb_enc_find("EUC-KR"));
-}
-
-ENC_ALIAS("eucCN", "EUC-CN");
-ENC_ALIAS("GB2312", "EUC-CN");
diff --git a/enc/euc_kr.c b/enc/euc_kr.c
index 364e1b212b..7f8b645974 100644
--- a/enc/euc_kr.c
+++ b/enc/euc_kr.c
@@ -190,4 +190,3 @@ OnigEncodingDefine(euc_kr, EUC_KR) = {
euckr_is_allowed_reverse_match
};
ENC_ALIAS("eucKR", "EUC-KR");
-ENC_REPLICATE("CP949", "EUC-KR");
diff --git a/enc/gb2312.c b/enc/gb2312.c
new file mode 100644
index 0000000000..b8d0d0af57
--- /dev/null
+++ b/enc/gb2312.c
@@ -0,0 +1,12 @@
+#include <ruby/ruby.h>
+#include <ruby/encoding.h>
+#include "regenc.h"
+
+void
+Init_gb2312(void)
+{
+ rb_enc_register("GB2312", rb_enc_find("EUC-KR"));
+}
+
+ENC_ALIAS("EUC-CN", "GB2312");
+ENC_ALIAS("eucCN", "GB2312");