merges r20720 from trunk into ruby_1_9_1.

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

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 43e7ee172..01073c719 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 13 15:55:37 2008  TAKAO Kouji  <kouji@takao7.net>
+
+	* ruby.c (process_options): fixed default_internal is nil.
+	  (closes #862)
+
 Sat Dec 13 13:03:20 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* complex.c: use rb_usascii_str_new2 instead of rb_str_new2.
diff --git a/ruby.c b/ruby.c
index 0b9d4cbf0..dd3f69861 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1204,7 +1204,7 @@ process_options(VALUE arg)
 	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);