summaryrefslogtreecommitdiffstats
path: root/encoding.c
diff options
context:
space:
mode:
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/encoding.c b/encoding.c
index a7a62e3bb..01677d1b9 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 */