diff options
author | kouji <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 06:58:58 +0000 |
---|---|---|
committer | kouji <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 06:58:58 +0000 |
commit | e53990e4bdbf1fc5aa36e5f2150d118f6e324106 (patch) | |
tree | baa876936dda1f620e61164845c14b669d1a0e6c | |
parent | ada58fe0130d7818bd4189a76656d2afc34f4268 (diff) | |
download | ruby-e53990e4bdbf1fc5aa36e5f2150d118f6e324106.tar.gz |
* ruby.c (process_options): fixed default_internal is nil.
(closes #862)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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); |