aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2004-12-12 21:57:28 +0000
committerJuri Linkov2004-12-12 21:57:28 +0000
commit98e008e989666a119f20fb43da0fdc13f5dbc53e (patch)
tree8f89df8a5d0a2d5f1b04cbdcc06cef5a5ccbf402
parent6ee8e6218d7dd2370653b0a76659391ff93dca6f (diff)
downloademacs-98e008e989666a119f20fb43da0fdc13f5dbc53e.tar.gz
emacs-98e008e989666a119f20fb43da0fdc13f5dbc53e.zip
(isearch-process-search-multibyte-characters):
Use `isearch-message' as initial input for `read-string' instead of adding it to the minibuffer prompt. After reading a string remove the initial value of `isearch-message' from the string.
-rw-r--r--lisp/international/isearch-x.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index 60736277b97..aad6b6e745e 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -97,7 +97,7 @@
97(defun isearch-process-search-multibyte-characters (last-char) 97(defun isearch-process-search-multibyte-characters (last-char)
98 (if (eq this-command 'isearch-printing-char) 98 (if (eq this-command 'isearch-printing-char)
99 (let ((overriding-terminal-local-map nil) 99 (let ((overriding-terminal-local-map nil)
100 (prompt (concat (isearch-message-prefix) isearch-message)) 100 (prompt (concat (isearch-message-prefix)))
101 (minibuffer-local-map isearch-minibuffer-local-map) 101 (minibuffer-local-map isearch-minibuffer-local-map)
102 str) 102 str)
103 (if isearch-input-method-function 103 (if isearch-input-method-function
@@ -107,11 +107,12 @@
107 (cons 'with-input-method 107 (cons 'with-input-method
108 (cons last-char unread-command-events)) 108 (cons last-char unread-command-events))
109 ;; Inherit current-input-method in a minibuffer. 109 ;; Inherit current-input-method in a minibuffer.
110 str (read-string prompt nil nil nil t)) 110 str (read-string prompt isearch-message nil nil t))
111 (if (not str) 111 (if (not str)
112 ;; All inputs were deleted while the input method 112 ;; All inputs were deleted while the input method
113 ;; was working. 113 ;; was working.
114 (setq str "") 114 (setq str "")
115 (setq str (substring str (length isearch-message)))
115 (if (and (= (length str) 1) 116 (if (and (= (length str) 1)
116 (= (aref str 0) last-char) 117 (= (aref str 0) last-char)
117 (>= last-char 128)) 118 (>= last-char 128))