[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100625: * src/search.c (boyer_moore): Take unibyte characters from pattern

[Andreas Schwab]

------------------------------------------------------------
revno: 100625
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Wed 2011-09-07 18:48:37 +0200
message:
  * src/search.c (boyer_moore): Take unibyte characters from pattern
  literally.  (Bug#9458)
modified:
  src/ChangeLog
  src/search.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-30 22:38:07 +0000
+++ b/src/ChangeLog     2011-09-07 16:48:37 +0000
@@ -1,3 +1,8 @@
+2011-09-07  Andreas Schwab  <address@hidden>
+
+       * search.c (boyer_moore): Take unibyte characters from pattern
+       literally.  (Bug#9458)
+
 2011-08-30  Chong Yidong  <address@hidden>
 
        * syntax.c (find_defun_start): Update all cache variables if

=== modified file 'src/search.c'
--- a/src/search.c      2011-01-02 23:50:46 +0000
+++ b/src/search.c      2011-09-07 16:48:37 +0000
@@ -1837,7 +1837,7 @@
                ch = -1;
            }
 
-         if (ch >= 0200)
+         if (ch >= 0200 && multibyte)
            j = (ch & 0x3F) | 0200;
          else
            j = *ptr;
@@ -1856,7 +1856,7 @@
              while (1)
                {
                  TRANSLATE (ch, inverse_trt, ch);
-                 if (ch >= 0200)
+                 if (ch >= 0200 && multibyte)
                    j = (ch & 0x3F) | 0200;
                  else
                    j = ch;