(isearch-complete1): If no completion,

don't clobber isearch-string, and return nil.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 826e2aae234cc130c1237cf3eada24cd8b2b7909..c48c141310adf906a16b1a6550598ef441b5639f 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1216,12 +1216,14 @@ If you want to search for just a space, type C-q SPC."
      ((or completion ; not nil, must be a string
          (= 0 (length isearch-string))) ; shouldn't have to say this
       (if (equal completion isearch-string)  ;; no extension?
-         (if completion-auto-help
-             (with-output-to-temp-buffer "*Isearch completions*"
-               (display-completion-list 
-                (all-completions isearch-string alist))))
-       (setq isearch-string completion))
-      t)
+         (progn
+           (if completion-auto-help
+               (with-output-to-temp-buffer "*Isearch completions*"
+                 (display-completion-list 
+                  (all-completions isearch-string alist))))
+           t)
+       (and completion
+            (setq isearch-string completion))))
      (t
       (message "No completion") ; waits a second if in minibuffer
       nil))))