summaryrefslogtreecommitdiffstats
path: root/ruby.c
diff options
context:
space:
mode:
authorkouji <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 06:58:58 +0000
committerkouji <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 06:58:58 +0000
commit37708ed4eeb957cf3101284b1a432e63fd125b30 (patch)
treebaa876936dda1f620e61164845c14b669d1a0e6c /ruby.c
parent634ac7aef99369ded2532473a7ed90a32357b035 (diff)
downloadruby-37708ed4eeb957cf3101284b1a432e63fd125b30.tar.gz
ruby-37708ed4eeb957cf3101284b1a432e63fd125b30.tar.xz
ruby-37708ed4eeb957cf3101284b1a432e63fd125b30.zip
* ruby.c (process_options): fixed default_internal is nil.
(closes #862) git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby.c b/ruby.c
index 0b6bb8227..aa6163c67 100644
--- a/ruby.c
+++ b/ruby.c
@@ -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);