From 61fd7dbf6d0cf3641d41cda3a3c2f6f3e4532865 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 18 Jan 2008 00:44:15 +0000 Subject: [PATCH] * re.c (rb_char_to_option_kcode): Regexp switch `s' should mean Windows-31J, as wells as `-Ks'. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ re.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1a4f8bf7ea..16c16d27f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 18 09:43:02 2008 NAKAMURA Usaku + + * re.c (rb_char_to_option_kcode): Regexp switch `s' should mean + Windows-31J, as wells as `-Ks'. + Fri Jan 18 09:22:07 2008 Yukihiro Matsumoto * parse.y (parser_initialize): explicitly call rb_ascii8bit_encoding(). diff --git a/re.c b/re.c index f17e276bba..67e56cdc61 100644 --- a/re.c +++ b/re.c @@ -188,7 +188,7 @@ rb_char_to_option_kcode(int c, int *option, int *kcode) *kcode = rb_enc_find_index("EUC-JP"); break; case 's': - *kcode = rb_enc_find_index("Shift_JIS"); + *kcode = rb_enc_find_index("Windows-31J"); break; case 'u': *kcode = rb_enc_find_index("UTF-8");