From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 12 Nov 1996 04:26:06 +0000 (+0000)
Subject: (isearch-complete1): If no completion,
X-Git-Tag: emacs-20.1~3378
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=36bcac3fe1b82f0b819df2f64a3a0f496d0c391a;p=emacs.git

(isearch-complete1): If no completion,
don't clobber isearch-string, and return nil.
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 826e2aae234..c48c141310a 100644
--- 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))))