matz	2007-12-14 02:30:54 +0900 (Fri, 14 Dec 2007)

  New Revision: 14220

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c

  Log:
    * encoding.c (rb_enc_compatible): 1st argument (typically the
      receiver) would have higher priority in encoding detection.

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

Index: encoding.c
===================================================================
--- encoding.c	(revision 14219)
+++ encoding.c	(revision 14220)
@@ -399,7 +399,7 @@
 	    }
 	    if (cr2 == ENC_CODERANGE_7BIT) {
 		if (idx1 == 0) return rb_enc_from_index(idx2);
-		if (idx2 == 0) return rb_enc_from_index(idx1);
+		return rb_enc_from_index(idx1);
 	    }
 	}
 	if (cr1 == ENC_CODERANGE_7BIT &&
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14219)
+++ ChangeLog	(revision 14220)
@@ -1,3 +1,8 @@
+Fri Dec 14 02:29:32 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* encoding.c (rb_enc_compatible): 1st argument (typically the
+	  receiver) would have higher priority in encoding detection.
+
 Fri Dec 14 02:05:42 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* io.c (rb_io_synchronized): should check if initialized.

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