From: Juri Linkov <juri@jurta.org>
Date: Sun, 12 Dec 2004 21:57:28 +0000 (+0000)
Subject: (isearch-process-search-multibyte-characters):
X-Git-Tag: ttn-vms-21-2-B4~3312
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=98e008e989666a119f20fb43da0fdc13f5dbc53e;p=emacs.git

(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.
---

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 @@
 (defun isearch-process-search-multibyte-characters (last-char)
   (if (eq this-command 'isearch-printing-char)
       (let ((overriding-terminal-local-map nil)
-	    (prompt (concat (isearch-message-prefix) isearch-message))
+	    (prompt (concat (isearch-message-prefix)))
 	    (minibuffer-local-map isearch-minibuffer-local-map)
 	    str)
 	(if isearch-input-method-function
@@ -107,11 +107,12 @@
 		    (cons 'with-input-method
 			  (cons last-char unread-command-events))
 		    ;; Inherit current-input-method in a minibuffer.
-		    str (read-string prompt nil nil nil t))
+		    str (read-string prompt isearch-message nil nil t))
 	      (if (not str)
 		  ;; All inputs were deleted while the input method
 		  ;; was working.
 		  (setq str "")
+		(setq str (substring str (length isearch-message)))
 		(if (and (= (length str) 1)
 			 (= (aref str 0) last-char)
 			 (>= last-char 128))