yugui	2008-12-16 19:25:42 +0900 (Tue, 16 Dec 2008)

  New Revision: 20788

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

  Log:
    merges r20720 from trunk into ruby_1_9_1.
    * ruby.c (process_options): fixed default_internal is nil.
      (closes #862)

  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 20787)
+++ ruby_1_9_1/ChangeLog	(revision 20788)
@@ -1,3 +1,8 @@
+Sat Dec 13 15:55:37 2008  TAKAO Kouji  <kouji@t...>
+
+	* ruby.c (process_options): fixed default_internal is nil.
+	  (closes #862)
+
 Sat Dec 13 13:03:20 2008  Tadayoshi Funaba  <tadf@d...>
 
 	* complex.c: use rb_usascii_str_new2 instead of rb_str_new2.
Index: ruby_1_9_1/ruby.c
===================================================================
--- ruby_1_9_1/ruby.c	(revision 20787)
+++ ruby_1_9_1/ruby.c	(revision 20788)
@@ -1204,7 +1204,7 @@
 	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);
 

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