diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-16 10:25:42 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-16 10:25:42 +0000 |
commit | 5f67291e42d9127963975be9ab149510c4eb9f8a (patch) | |
tree | 3b1f63a001ea3de4a13341a9c9020ce54970365d | |
parent | 7726b089bdda2b38464e0af10e4b9320d6404c8b (diff) |
merges r20720 from trunk into ruby_1_9_1.
* ruby.c (process_options): fixed default_internal is nil.
(closes #862)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20788 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 13:03:20 2008 Tadayoshi Funaba <tadf@dotrb.org> * complex.c: use rb_usascii_str_new2 instead of rb_str_new2. @@ -1204,7 +1204,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); |