matz	2008-10-22 13:27:32 +0900 (Wed, 22 Oct 2008)

  New Revision: 19884

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19884

  Log:
    * re.c (unescape_escaped_nonascii): back out the last change on
      the function.  [ruby-dev:36818]

  Modified files:
    trunk/ChangeLog
    trunk/re.c

Index: re.c
===================================================================
--- re.c	(revision 19883)
+++ re.c	(revision 19884)
@@ -1967,12 +1967,8 @@
 
     l = rb_enc_precise_mbclen(chbuf, chbuf+chlen, enc);
     if (MBCLEN_INVALID_P(l)) {
-        if (*encp == 0)
-            enc = *encp = rb_ascii8bit_encoding();
-        else if (*encp != rb_ascii8bit_encoding()) {
-	    strcpy(err, "invalid multibyte escape");
-            return -1;
-        }
+        strcpy(err, "invalid multibyte escape");
+        return -1;
     }
     if (1 < chlen || (chbuf[0] & 0x80)) {
         rb_str_buf_cat(buf, chbuf, chlen);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19883)
+++ ChangeLog	(revision 19884)
@@ -1,3 +1,8 @@
+Wed Oct 22 13:16:47 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* re.c (unescape_escaped_nonascii): back out the last change on
+	  the function.  [ruby-dev:36818]
+
 Wed Oct 22 07:09:19 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/zlib/zlib.c (rb_gzreader_ungetc): should be able to unget

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