(ido-buffer-internal): Use with-no-warnings.

(ido-make-merged-file-list): Use while-no-input.

diff --git a/lisp/ido.el b/lisp/ido.el
index 7b8e8c726ef8bfdc03570747e3dd1a7188867a28..d0e6af667e88269adaa1288c449683afa554a96a 100644 (file)
--- 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