From 0605d15f6aeb776a0699a49fdb761ae1e9a40d6e Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 14 Jan 2008 09:08:45 +0000 Subject: * encoding.c (rb_locale_encoding): return US-ASCII when charmap is nil. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index a7a62e3bb3..01677d1b92 100644 --- a/encoding.c +++ b/encoding.c @@ -874,9 +874,9 @@ rb_locale_encoding(void) int idx; if (NIL_P(charmap)) - return rb_ascii8bit_encoding(); - - idx = rb_enc_find_index(StringValueCStr(charmap)); + idx = rb_enc_find_index("US-ASCII"); + else + idx = rb_enc_find_index(StringValueCStr(charmap)); if (idx < 0) return rb_ascii8bit_encoding(); @@ -1093,7 +1093,7 @@ Init_Encoding(void) rb_define_dummy_encoding("ISO-2022-JP"); rb_enc_alias("ISO2022-JP", "ISO-2022-JP"); rb_define_dummy_encoding("ISO-2022-JP-2"); - rb_enc_alias("ISO2022-JP-2", "ISO-2022-JP-2"); + rb_enc_alias("ISO2022-JP2", "ISO-2022-JP-2"); } /* locale insensitive functions */ -- cgit v1.2.3