diff options
| author | Kim F. Storm <storm@cua.dk> | 2005-08-15 12:29:54 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2005-08-15 12:29:54 +0000 |
| commit | bd42ff420c2f1406045c3c482b0e0b3005ee8f9a (patch) | |
| tree | 6eb3cf62f5fefc17994d7e47210158f5bd73d2fb /lisp/ido.el | |
| parent | 9a85b80ace42021e4064550bc8a2b5efb8a6abb7 (diff) | |
| download | emacs-bd42ff420c2f1406045c3c482b0e0b3005ee8f9a.tar.gz | |
(ido-buffer-internal): Use with-no-warnings.
(ido-make-merged-file-list): Use while-no-input.
Diffstat (limited to 'lisp/ido.el')
| -rw-r--r-- | lisp/ido.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/ido.el b/lisp/ido.el index 7b8e8c726ef..d0e6af667e8 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1959,7 +1959,9 @@ If INITIAL is non-nil, it specifies the initial input string." (if (eq method 'insert) (progn (ido-record-command 'insert-buffer buf) - (insert-buffer buf)) + (with-no-warnings + ;; we really want to run insert-buffer here + (insert-buffer buf))) (ido-visit-buffer buf method t))) ;; buffer doesn't exist @@ -3012,11 +3014,10 @@ for first matching file." (let (res) (message "Searching for `%s'...." text) (condition-case nil - (unless (catch 'input-pending-p - (let ((throw-on-input 'input-pending-p)) - (setq res (ido-make-merged-file-list-1 text auto wide)) - t)) - (setq res 'input-pending-p)) + (if (eq t (setq res + (while-no-input + (ido-make-merged-file-list-1 text auto wide)))) + (setq res 'input-pending-p)) (quit (setq res t ido-try-merged-list nil |