matz	2007-12-13 16:44:52 +0900 (Thu, 13 Dec 2007)

  New Revision: 14208

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

  Log:
    * encoding.c (rb_enc_compatible): should not judge compatibility
      based on rb_enc_asciicompat().

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

Index: encoding.c
===================================================================
--- encoding.c	(revision 14207)
+++ encoding.c	(revision 14208)
@@ -388,12 +388,6 @@
     if (idx1 == idx2) {
 	return rb_enc_from_index(idx1);
     }
-
-    if (idx1 == 0 && rb_enc_asciicompat(enc = rb_enc_from_index(idx2)))
-	return enc;
-    if (idx2 == 0 && rb_enc_asciicompat(enc = rb_enc_from_index(idx1)))
-	return enc;
-
     if (BUILTIN_TYPE(str1) != T_STRING) {
 	VALUE tmp = str1;
 	str1 = str2;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14207)
+++ ChangeLog	(revision 14208)
@@ -1,3 +1,8 @@
+Thu Dec 13 16:41:37 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* encoding.c (rb_enc_compatible): should not judge compatibility
+	  based on rb_enc_asciicompat().
+
 Thu Dec 13 13:09:03 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* include/ruby/io.h (MakeOpenFile): fptr->enc should be

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