yugui	2009-03-03 20:38:55 +0900 (Tue, 03 Mar 2009)

  New Revision: 22729

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22729

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ruby.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22728)
+++ ruby_1_9_1/ChangeLog	(revision 22729)
@@ -1,3 +1,7 @@
+Fri Feb  6 12:11:24 2009  NAKAMURA Usaku  <usa@r...>
+
+	* ruby.c (process_options): set initial default_external before -r.
+
 Sun Feb 22 10:43:57 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_eval.c (method_missing): should not pop cfp if missing method
Index: ruby_1_9_1/ruby.c
===================================================================
--- ruby_1_9_1/ruby.c	(revision 22728)
+++ ruby_1_9_1/ruby.c	(revision 22729)
@@ -1289,6 +1289,13 @@
 	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));

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/