merges r20720 from trunk into ruby_1_9_1.

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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/ruby.c b/ruby.c
index 0b9d4cbf03..dd3f69861c 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);