From: Andreas Schwab <schwab@suse.de>
Date: Wed, 27 Aug 2008 10:56:15 +0000 (+0000)
Subject: (search_buffer): Set char_base to zero only at the end.
X-Git-Tag: emacs-pretest-23.0.90~3238
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dafaabd183be9c7d8a7360f807e474c726c38a4c;p=emacs.git

(search_buffer): Set char_base to zero only at the end.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 259bc7f04ed..e345916a47f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-27  Andreas Schwab  <schwab@suse.de>
+
+	* search.c (search_buffer): Set char_base to zero only at the end.
+
 2008-08-27  Kenichi Handa  <handa@m17n.org>
 
 	* fileio.c (report_file_error): Fix handling of multibyte error
diff --git a/src/search.c b/src/search.c
index 7bdb4ec07d2..df054434b63 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1340,11 +1340,7 @@ search_buffer (string, pos, pos_byte, lim, lim_byte, n,
 			      if (this_char_base > 0)
 				boyer_moore_ok = 0;
 			      else
-				{
-				  this_char_base = 0;
-				  if (char_base < 0)
-				    char_base = this_char_base;
-				}
+				this_char_base = 0;
 			    }
 			  else if (CHAR_BYTE8_P (inverse))
 			    /* Boyer-moore search can't handle a
@@ -1356,8 +1352,7 @@ search_buffer (string, pos, pos_byte, lim, lim_byte, n,
 			      this_char_base = inverse & ~0x3F;
 			      if (char_base < 0)
 				char_base = this_char_base;
-			      else if (char_base > 0
-				       && this_char_base != char_base)
+			      else if (this_char_base != char_base)
 				boyer_moore_ok = 0;
 			    }
 			  else if ((inverse & ~0x3F) != this_char_base)
@@ -1368,8 +1363,6 @@ search_buffer (string, pos, pos_byte, lim, lim_byte, n,
 			}
 		    }
 		}
-	      if (char_base < 0)
-		char_base = 0;
 
 	      /* Store this character into the translated pattern.  */
 	      bcopy (str, pat, charlen);
@@ -1377,6 +1370,11 @@ search_buffer (string, pos, pos_byte, lim, lim_byte, n,
 	      base_pat += in_charlen;
 	      len_byte -= in_charlen;
 	    }
+
+	  /* If char_base is still negative we didn't find any translated
+	     non-ASCII characters.  */
+	  if (char_base < 0)
+	    char_base = 0;
 	}
       else
 	{