From 18c0a7eebf270bbdf1c6701bbbbb9fbdb270ed0a Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 3 Mar 2009 11:38:55 +0000 Subject: merging r22085 needs r20086. [ruby-dev:38067] merges r22086 from trunk into ruby_1_9_1. * ruby.c (process_options): set initial default_external before -r. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ruby.c | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3a4c6ea24b..eb480282c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Feb 6 12:11:24 2009 NAKAMURA Usaku + + * ruby.c (process_options): set initial default_external before -r. + Sun Feb 22 10:43:57 2009 Nobuyoshi Nakada * vm_eval.c (method_missing): should not pop cfp if missing method diff --git a/ruby.c b/ruby.c index 3d405f228e..3392c74685 100644 --- a/ruby.c +++ b/ruby.c @@ -1289,6 +1289,13 @@ process_options(VALUE arg) opt->src.enc.index = opt_enc_index(opt->src.enc.name); src_encoding_index = opt->src.enc.index; } + if (opt->ext.enc.index >= 0) { + enc = rb_enc_from_index(opt->ext.enc.index); + } + else { + enc = lenc; + } + rb_enc_set_default_external(rb_enc_from_encoding(enc)); if (opt->intern.enc.index >= 0) { enc = rb_enc_from_index(opt->intern.enc.index); rb_enc_set_default_internal(rb_enc_from_encoding(enc)); -- cgit v1.2.3