From f32421950029cafebffe3c5d57d6935413a8e314 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 31 Oct 2008 02:35:41 +0000
Subject: * encoding.c (rb_enc_set_default_internal): no alias "internal" if  
 defalt internal is not set.  [ruby-dev:37000]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 encoding.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'encoding.c')

diff --git a/encoding.c b/encoding.c
index e9fcbfcb3..7b7d30113 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1101,8 +1101,13 @@ rb_enc_set_default_internal(VALUE encoding)
     if (default_internal_index != -2)
 	/* Already set */
 	return;
-    default_internal_index = encoding == Qnil ?
-				-1 :rb_enc_to_index(rb_to_encoding(encoding));
+    if (NIL_P(encoding)) {
+	default_internal_index = -1;
+	default_internal = 0;
+	return;
+    }
+
+    default_internal_index = rb_enc_to_index(rb_to_encoding(encoding));
     /* Convert US-ASCII => UTF-8 */
     if (default_internal_index == rb_usascii_encindex())
 	default_internal_index = rb_utf8_encindex();
-- 
cgit