(isearch-process-search-multibyte-characters): Remove unneeded `concat'.

Add intermediate values to `junk-hist' instead of `minibuffer-history'.
Test the length of `str'.

2 files changed, 22 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 482ae0ea1ca..15c729f1a09 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2005-07-18  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-mode-map): Remove key bindings for regexp
+        chars * ? } |.
+        (isearch-fallback): Don't call `isearch-process-search-char'.
+        (isearch-*-char, isearch-}-char, isearch-|-char): Remove functions.
+        (isearch-process-search-char): Call `isearch-fallback' for regexp
+        chars * ? } |.
+        (isearch-return-char): Make obsolete with `make-obsolete' instead
+        of simply documenting it as obsolete in the docstring.
+        (isearch-fallback): Refill docstring.
+
+        * international/isearch-x.el
+        (isearch-process-search-multibyte-characters): Remove unneeded `concat'.
+        Add intermediate values to `junk-hist' instead of `minibuffer-history'.
+        Test the length of `str'.
+
 2005-07-18  Juanma Barranquero  <lekktu@gmail.com>
 
         * allout.el (allout-resolve-xref): Fix typos in error strings.
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index 46193d24d2c..1d0d50b01ac 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -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))