summaryrefslogtreecommitdiffstats
path: root/ruby.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-08 15:31:15 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-08 15:31:15 +0000
commita9246704b145d362f644c9cc262d20d6c2dba990 (patch)
tree43a3ed2b2326192d804ff6461ad6cb840b091893 /ruby.c
parentf0fc0463564b9d8f9c22e1c82c998646e930422f (diff)
merges r24337 from trunk into ruby_1_9_1.
-- Set encodings of stdio after setting default internal and external. * io.c (rb_stdio_set_default_encoding): added. * ruby.c (process_options): call rb_stdio_set_default_encoding after setting defualt internal and external. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ruby.c b/ruby.c
index c6cfdf7e1..68d8f97a4 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1370,6 +1370,7 @@ process_options(VALUE arg)
else if (!rb_default_internal_encoding())
/* Freeze default_internal */
rb_enc_set_default_internal(Qnil);
+ rb_stdio_set_default_encoding();
if (!tree) return Qfalse;