nobu	2008-03-19 14:08:49 +0900 (Wed, 19 Mar 2008)

  New Revision: 15798

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

  Log:
    * encoding.c (enc_check_encoding): should not load autoloaded encoding
      directly, instead use rb_enc_find_index() which deal with alias and
      replica.  [ruby-core:15957]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15798&r2=15797&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=15798&r2=15797&diff_format=u

Index: encoding.c
===================================================================
--- encoding.c	(revision 15797)
+++ encoding.c	(revision 15798)
@@ -108,7 +108,7 @@
     if (rb_enc_from_index(index) != enc)
 	return -1;
     if (enc_autoload_p(enc)) {
-	index = load_encoding(enc->name);
+	index = rb_enc_find_index(enc->name);
     }
     return index;
 }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15797)
+++ ChangeLog	(revision 15798)
@@ -1,3 +1,9 @@
+Wed Mar 19 14:08:47 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (enc_check_encoding): should not load autoloaded encoding
+	  directly, instead use rb_enc_find_index() which deal with alias and
+	  replica.  [ruby-core:15957]
+
 Wed Mar 19 11:49:47 2008  NAKAMURA Usaku  <usa@r...>
 
 	* regint.h (include): include ruby.h instead of defines.h and config.h.

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