yugui	2009-02-22 18:48:05 +0900 (Sun, 22 Feb 2009)

  New Revision: 22516

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

  Log:
    merges r22085 from trunk into ruby_1_9_1.
    * ruby.c (process_options): -K and -E in shebang should be reflect to
      default_external. [ruby-dev:37920]

  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 22515)
+++ ruby_1_9_1/ChangeLog	(revision 22516)
@@ -1,3 +1,8 @@
+Fri Feb  6 12:03:47 2009  NAKAMURA Usaku  <usa@r...>
+
+	* ruby.c (process_options): -K and -E in shebang should be reflect to
+	  default_external. [ruby-dev:37920]
+
 Fri Feb  6 02:51:59 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* string.c (rb_str_each_codepoint): update RDoc for
Index: ruby_1_9_1/ruby.c
===================================================================
--- ruby_1_9_1/ruby.c	(revision 22515)
+++ ruby_1_9_1/ruby.c	(revision 22516)
@@ -1289,13 +1289,6 @@
 	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));
@@ -1355,6 +1348,13 @@
 	});
     }
 
+    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) {
 	/* Set in the shebang line */
 	enc = rb_enc_from_index(opt->intern.enc.index);

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