# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1121697171 0
# Node ID 9a14f5181afdc0dbaa5b268cc18b277e508e2688
# Parent  8c591f014cf5e7554c9ae282436433efecc51465
(isearch-process-search-multibyte-characters): Remove unneeded `concat'.
Add intermediate values to `junk-hist' instead of `minibuffer-history'.
Test the length of `str'.

diff -r 8c591f014cf5 -r 9a14f5181afd lisp/international/isearch-x.el
--- a/lisp/international/isearch-x.el	Mon Jul 18 14:32:30 2005 +0000
+++ b/lisp/international/isearch-x.el	Mon Jul 18 14:32:51 2005 +0000
@@ -98,9 +98,9 @@
 (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)))
+	    (prompt (isearch-message-prefix))
 	    (minibuffer-local-map isearch-minibuffer-local-map)
-	    str)
+	    str junk-hist)
 	(if isearch-input-method-function
 	    (let (;; Let input method work rather tersely.
 		  (input-method-verbose-flag nil))
@@ -108,8 +108,8 @@
 		    (cons 'with-input-method
 			  (cons last-char unread-command-events))
 		    ;; Inherit current-input-method in a minibuffer.
-		    str (read-string prompt isearch-message nil nil t))
-	      (if (not str)
+		    str (read-string prompt isearch-message 'junk-hist nil t))
+	      (if (or (not str) (< (length str) (length isearch-message)))
 		  ;; All inputs were deleted while the input method
 		  ;; was working.
 		  (setq str "")
@@ -124,7 +124,7 @@
 	    (setq unread-command-events
 		  (cons 'with-keyboard-coding
 			(cons last-char unread-command-events))
-		  str (read-string prompt)))
+		  str (read-string prompt nil 'junk-hist)))
 
 	(if (and str (> (length str) 0))
 	    (let ((unread-command-events nil))