From: Andreas Schwab <schwab@suse.de>
Date: Mon, 17 Mar 2008 14:52:34 +0000 (+0000)
Subject: (re_match_2_internal): Properly match raw 8-bit bytes
X-Git-Tag: emacs-pretest-23.0.90~7075
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b8be006c60587d86226dae192a74c150d2a6501;p=emacs.git

(re_match_2_internal): Properly match raw 8-bit bytes
against a charset.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a5880e781a7..8d3397c7834 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-17  Andreas Schwab  <schwab@suse.de>
 
+	* regex.c (re_match_2_internal): Properly match raw 8-bit bytes
+	against a charset.
+
 	* lisp.h (Fbuffer_list): Declare.
 
 2008-03-17  Jan Dj$(Q)Z(Brv  <jan.h.d@swipnet.se>
diff --git a/src/regex.c b/src/regex.c
index 9f2a42b4870..eca78f2ab94 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -5689,6 +5689,8 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
 			c = c1;
 		      }
 		  }
+		else
+		  unibyte_char = true;
 	      }
 
 	    if (unibyte_char && c < (1 << BYTEWIDTH))