diff options
| author | Richard M. Stallman | 1996-11-12 04:26:06 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-11-12 04:26:06 +0000 |
| commit | 36bcac3fe1b82f0b819df2f64a3a0f496d0c391a (patch) | |
| tree | 18e312980f0ec84329307ec23d8889e21e1b30b5 | |
| parent | b7734773b91ec2de50d1fe6c886b078556a4cff7 (diff) | |
| download | emacs-36bcac3fe1b82f0b819df2f64a3a0f496d0c391a.tar.gz emacs-36bcac3fe1b82f0b819df2f64a3a0f496d0c391a.zip | |
(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." | |||
| 1216 | ((or completion ; not nil, must be a string | 1216 | ((or completion ; not nil, must be a string |
| 1217 | (= 0 (length isearch-string))) ; shouldn't have to say this | 1217 | (= 0 (length isearch-string))) ; shouldn't have to say this |
| 1218 | (if (equal completion isearch-string) ;; no extension? | 1218 | (if (equal completion isearch-string) ;; no extension? |
| 1219 | (if completion-auto-help | 1219 | (progn |
| 1220 | (with-output-to-temp-buffer "*Isearch completions*" | 1220 | (if completion-auto-help |
| 1221 | (display-completion-list | 1221 | (with-output-to-temp-buffer "*Isearch completions*" |
| 1222 | (all-completions isearch-string alist)))) | 1222 | (display-completion-list |
| 1223 | (setq isearch-string completion)) | 1223 | (all-completions isearch-string alist)))) |
| 1224 | t) | 1224 | t) |
| 1225 | (and completion | ||
| 1226 | (setq isearch-string completion)))) | ||
| 1225 | (t | 1227 | (t |
| 1226 | (message "No completion") ; waits a second if in minibuffer | 1228 | (message "No completion") ; waits a second if in minibuffer |
| 1227 | nil)))) | 1229 | nil)))) |