diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ruby.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Dec 13 15:55:37 2008 TAKAO Kouji <kouji@takao7.net> + + * ruby.c (process_options): fixed default_internal is nil. + (closes #862) + Sat Dec 13 14:24:38 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> * test/ruby/enc/test_utf16.rb: feature changed in r20626. @@ -1244,7 +1244,7 @@ process_options(VALUE arg) enc = rb_enc_from_index(opt->intern.enc.index); rb_enc_set_default_internal(rb_enc_from_encoding(enc)); } - else + else if (!rb_default_internal_encoding()) /* Freeze default_internal */ rb_enc_set_default_internal(Qnil); |