nobu	2008-01-18 11:39:12 +0900 (Fri, 18 Jan 2008)

  New Revision: 15105

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

  Log:
    * encoding.c (rb_enc_find_index): use original encoding name to
      replicate loaded encoding instead alias.


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

Index: encoding.c
===================================================================
--- encoding.c	(revision 15104)
+++ encoding.c	(revision 15105)
@@ -487,14 +487,16 @@
 	if (enc_initialized_p(enc) &&
 	    (base = enc_base_encoding(ENC_FROM_ENCODING(enc)), !NIL_P(base))) {
 	    if ((b = enc_check_encoding(base)) < 0) {
+#if 0
 		st_data_t key, val;
 		key = (st_data_t)name;
 		if (st_delete(enc_table.names, &key, &val)) {
 		    if (enc->name != (char *)key) xfree((char *)key);
 		}
+#endif
 		return -1;
 	    }
-	    enc_register_at(i, name, rb_enc_from_index(b));
+	    enc_register_at(i, rb_enc_name(enc), rb_enc_from_index(b));
 	}
 	else {
 	    i = load_encoding(rb_enc_name(enc));
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15104)
+++ ChangeLog	(revision 15105)
@@ -1,3 +1,8 @@
+Fri Jan 18 11:39:10 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (rb_enc_find_index): use original encoding name to
+	  replicate loaded encoding instead alias.
+
 Fri Jan 18 09:43:02 2008  NAKAMURA Usaku  <usa@r...>
 
 	* re.c (rb_char_to_option_kcode): Regexp switch `s' should mean

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