Merge changes from emacs-23 branch

[gnu-emacs] / src / search.c

diff --git a/src/search.c b/src/search.c
index b3d67e6c4313189751e1bdb67fc49522c0b53b74..a3b4e1dcbcef545c162d142075cb01fb1550ea99 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1760,7 +1760,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
                ch = -1;
            }
 
-         if (ch >= 0200)
+         if (ch >= 0200 && multibyte)
            j = (ch & 0x3F) | 0200;
          else
            j = *ptr;
@@ -1779,7 +1779,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
              while (1)
                {
                  TRANSLATE (ch, inverse_trt, ch);
-                 if (ch >= 0200)
+                 if (ch >= 0200 && multibyte)
                    j = (ch & 0x3F) | 0200;
                  else
                    j = ch;