nobu	2007-12-25 15:59:53 +0900 (Tue, 25 Dec 2007)

  New Revision: 14674

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

  Log:
    * encoding.c (rb_enc_register): do not use based_encoding to check if
      dummy encoding.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14674&r2=14673
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=14674&r2=14673

Index: encoding.c
===================================================================
--- encoding.c	(revision 14673)
+++ encoding.c	(revision 14674)
@@ -166,7 +166,6 @@
     return enc_register_at(index - 1, name, encoding);
 }
 
-static VALUE enc_based_encoding(VALUE);
 static void set_encoding_const(const char *, rb_encoding *);
 int rb_enc_registered(const char *name);
 
@@ -183,7 +182,7 @@
 	    index = enc_register(name, encoding);
 	}
 	else if (enc_initialized_p(oldenc) &&
-		 !NIL_P(enc_based_encoding(ENC_FROM_ENCODING(oldenc)))) {
+		 !ENC_DUMMY_P(ENC_FROM_ENCODING(oldenc))) {
 	    enc_register_at(index, name, encoding);
 	}
 	else {
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14673)
+++ ChangeLog	(revision 14674)
@@ -1,3 +1,8 @@
+Tue Dec 25 15:59:51 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (rb_enc_register): do not use based_encoding to check if
+	  dummy encoding.
+
 Tue Dec 25 15:55:14 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_succ): fix for string with non-alphanumeric chars.

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