kouji	2008-12-13 15:58:58 +0900 (Sat, 13 Dec 2008)

  New Revision: 20720

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

  Log:
    * ruby.c (process_options): fixed default_internal is nil.
      (closes #862)

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20719)
+++ ChangeLog	(revision 20720)
@@ -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 14:24:38 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* test/ruby/enc/test_utf16.rb: feature changed in r20626.
Index: ruby.c
===================================================================
--- ruby.c	(revision 20719)
+++ ruby.c	(revision 20720)
@@ -1244,7 +1244,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/