yugui	2008-10-31 22:55:58 +0900 (Fri, 31 Oct 2008)

  New Revision: 20080

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

  Log:
    merges r20068 from trunk into ruby_1_9_1.
    * encoding.c (rb_enc_set_default_internal): no alias "internal" if
      defalt internal is not set.  [ruby-dev:37000]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/encoding.c

Index: ruby_1_9_1/encoding.c
===================================================================
--- ruby_1_9_1/encoding.c	(revision 20079)
+++ ruby_1_9_1/encoding.c	(revision 20080)
@@ -1101,8 +1101,13 @@
     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();
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20079)
+++ ruby_1_9_1/ChangeLog	(revision 20080)
@@ -1,3 +1,8 @@
+Fri Oct 31 11:35:38 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (rb_enc_set_default_internal): no alias "internal" if
+	  defalt internal is not set.  [ruby-dev:37000]
+
 Fri Oct 31 21:28:14 2008  Yusuke Endoh  <mame@t...>
 
 	* lib/webrick/httpauth/digestauth.rb

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/