diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-11-12 04:26:06 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-11-12 04:26:06 +0000 |
| commit | fbd0c0e3f38c66d56fd3c807c8f6db646d4b82ca (patch) | |
| tree | d65c192598c3998399f2c7933a348cfc59d0860a | |
| parent | fc7dd8b8016f01c4deda77013971290984030c50 (diff) | |
| download | emacs-fbd0c0e3f38c66d56fd3c807c8f6db646d4b82ca.tar.gz | |
(isearch-complete1): If no completion,
don't clobber isearch-string, and return nil.
| -rw-r--r-- | lisp/isearch.el | 14 |
1 files changed, 8 insertions, 6 deletions
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)))) |