aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2003-03-17 05:38:39 +0000
committerKenichi Handa2003-03-17 05:38:39 +0000
commit58b8be1cfe873434395ee1ad7d71ea84f2e8b385 (patch)
tree9f17828c4b0ad17c5a6b69f46deff2f218252034
parent77fb5d1a888b584f165e1b42806ba56019426655 (diff)
downloademacs-58b8be1cfe873434395ee1ad7d71ea84f2e8b385.tar.gz
emacs-58b8be1cfe873434395ee1ad7d71ea84f2e8b385.zip
(ctext-post-read-conversion): Convert the
search pattern to multibyte by string-to-multibyte.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule.el8
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d418634ed3..efb16cf9370 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-03-17 Kenichi Handa <handa@m17n.org>
2
3 * international/mule.el (ctext-post-read-conversion): Convert the
4 search pattern to multibyte by string-to-multibyte.
5
12003-03-16 Deepak Goel <deego@gnufans.org> 62003-03-16 Deepak Goel <deego@gnufans.org>
2 7
3 * calc/calc-forms.el (math-tzone-names): Introduce UTC as an alias 8 * 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 8e81dfb0679..9ba35cd32b9 100644
--- 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.")
1410 (newpt (make-marker)) 1410 (newpt (make-marker))
1411 (modified-p (buffer-modified-p)) 1411 (modified-p (buffer-modified-p))
1412 (case-fold-search nil) 1412 (case-fold-search nil)
1413 ;; We need multibyte conversion of "TO" type because the
1414 ;; buffer may be multibyte, and, in that case, the pattern
1415 ;; must contain eight-bit-control/graphic characters.
1416 (pattern (string-to-multibyte "\\(\e\\)%/[0-4]\\([\200-\377][\200-\377]\\)\\([^\002]+\\)\002\\|\e%G[^\e]+\e%@"))
1413 last-coding-system-used 1417 last-coding-system-used
1414 encoding textlen chset) 1418 encoding textlen chset)
1415 (while (re-search-forward 1419 (while (re-search-forward pattern nil 'move)
1416 "\\(\e\\)%/[0-4]\\([\200-\377][\200-\377]\\)\\([^\002]+\\)\002\\|\e%G[^\e]+\e%@"
1417 nil 'move)
1418 (set-marker newpt (point)) 1420 (set-marker newpt (point))
1419 (set-marker pt (match-beginning 0)) 1421 (set-marker pt (match-beginning 0))
1420 (if (= (preceding-char) ?@) 1422 (if (= (preceding-char) ?@)