Mercurial > emacs

changeset 16566:45e694f5babe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(isearch-complete1): If no completion, don't clobber isearch-string, and return nil.
author Richard M. Stallman <rms@gnu.org>
date Tue, 12 Nov 1996 04:26:06 +0000
parents 0bef6ef9964b
children a41b302694aa
files lisp/isearch.el
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/isearch.el	Tue Nov 12 04:13:06 1996 +0000
+++ b/lisp/isearch.el	Tue Nov 12 04:26:06 1996 +0000
@@ -1216,12 +1216,14 @@
      ((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))))