From a8f7383a3964a786767f9c546aa173ca5718c107 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 16 Dec 2008 10:25:42 +0000 Subject: merges r20720 from trunk into ruby_1_9_1. * ruby.c (process_options): fixed default_internal is nil. (closes #862) git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ruby.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ruby.c') diff --git a/ruby.c b/ruby.c index 0b9d4cbf0..dd3f69861 100644 --- a/ruby.c +++ b/ruby.c @@ -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); -- cgit