matz	2008-01-22 15:56:44 +0900 (Tue, 22 Jan 2008)

  New Revision: 15168

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

  Log:
    * encoding.c (rb_enc_compatible): wrong compatibility condition.
      [ruby-dev:33273]

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

Index: encoding.c
===================================================================
--- encoding.c	(revision 15167)
+++ encoding.c	(revision 15168)
@@ -669,6 +669,7 @@
 	    if (cr1 != cr2) {
 		/* may need to handle ENC_CODERANGE_BROKEN */
 		if (cr1 == ENC_CODERANGE_7BIT) return enc2;
+		if (cr2 == ENC_CODERANGE_7BIT) return enc1;
 	    }
 	    if (cr2 == ENC_CODERANGE_7BIT) {
 		if (idx1 == 0) return enc2;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15167)
+++ ChangeLog	(revision 15168)
@@ -12,6 +12,9 @@
 	* encoding.c (rb_enc_compatible): encoding must be ASCII
 	  compatible before checking ENC_CODERANGE_7BIT.
 
+	* encoding.c (rb_enc_compatible): wrong compatibility condition.
+	  [ruby-dev:33273]
+
 Tue Jan 22 09:26:47 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_each_char): iterates over a shadow.

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