2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e2dda6ab8..143ed7be4e 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 14:24:38 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* test/ruby/enc/test_utf16.rb: feature changed in r20626.
diff --git a/ruby.c b/ruby.c
index 0b6bb8227e..aa6163c67b 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1244,7 +1244,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);