[Emacs-diffs] Changes to emacs/src/search.c,v

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/08/27 10:56:18

Index: search.c
===================================================================
RCS file: /sources/emacs/emacs/src/search.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -b -r1.233 -r1.234
--- search.c    14 May 2008 07:49:50 -0000      1.233
+++ search.c    27 Aug 2008 10:56:17 -0000      1.234
@@ -1340,11 +1340,7 @@
                              if (this_char_base > 0)
                                boyer_moore_ok = 0;
                              else
-                               {
                                  this_char_base = 0;
-                                 if (char_base < 0)
-                                   char_base = this_char_base;
-                               }
                            }
                          else if (CHAR_BYTE8_P (inverse))
                            /* Boyer-moore search can't handle a
@@ -1356,8 +1352,7 @@
                              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 @@
                        }
                    }
                }
-             if (char_base < 0)
-               char_base = 0;
 
              /* Store this character into the translated pattern.  */
              bcopy (str, pat, charlen);
@@ -1377,6 +1370,11 @@
              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
        {