summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--encoding.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a5d0bbfe..1b4c6d37c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 5 11:48:19 2008 Tanaka Akira <akr@fsij.org>
+
+ * encoding.c (Init_Encoding): alias csWindows31J to Windows-31J.
+ IE6 accepts csWindows31J but Windows-31J.
+
Sat Jan 5 02:21:10 2008 Tanaka Akira <akr@fsij.org>
* include/ruby/ruby.h (rb_intern): memorize interned ID for constant
diff --git a/encoding.c b/encoding.c
index fcb40795c..83399c763 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1010,6 +1010,7 @@ Init_Encoding(void)
rb_enc_replicate("Windows-31J", rb_enc_from_index(ENCINDEX_SJIS));
rb_enc_alias("CP932", "Windows-31J");
+ rb_enc_alias("csWindows31J", "Windows-31J"); /* IANA. IE6 accepts csWindows31J but Windows-31J. */
for (i = 0; i < enc_table_size; ++i) {
rb_encoding *enc = enc_table[i].enc;