(ctext-post-read-conversion): Convert the

search pattern to multibyte by string-to-multibyte.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d418634ed32e0f89aecfea972e63301815702be..efb16cf93705c446d950c67f199eef257e5672b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-17  Kenichi Handa  <handa@m17n.org>
+
+       * international/mule.el (ctext-post-read-conversion): Convert the
+       search pattern to multibyte by string-to-multibyte.
+
 2003-03-16  Deepak Goel  <deego@gnufans.org>
 
        * calc/calc-forms.el (math-tzone-names): Introduce UTC as an alias

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 8e81dfb06794be658a7dfc22c14709b248984cfc..9ba35cd32b97e85a435e2a55a031f39dcba11709 100644 (file)
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1410,11 +1410,13 @@ The cdr of each element is the corresponding Emacs charset or coding system.")
          (newpt (make-marker))
          (modified-p (buffer-modified-p))
          (case-fold-search nil)
+         ;; We need multibyte conversion of "TO" type because the
+         ;; buffer may be multibyte, and, in that case, the pattern
+         ;; must contain eight-bit-control/graphic characters.
+         (pattern (string-to-multibyte "\\(\e\\)%/[0-4]\\([\200-\377][\200-\377]\\)\\([^\002]+\\)\002\\|\e%G[^\e]+\e%@"))
          last-coding-system-used
          encoding textlen chset)
-      (while (re-search-forward
-             "\\(\e\\)%/[0-4]\\([\200-\377][\200-\377]\\)\\([^\002]+\\)\002\\|\e%G[^\e]+\e%@"
-             nil 'move)
+      (while (re-search-forward pattern nil 'move)
        (set-marker newpt (point))
        (set-marker pt (match-beginning 0))
        (if (= (preceding-char) ?@)