[Emacs-diffs] Changes to emacs/lisp/ido.el

[Kim F . Storm]

Index: emacs/lisp/ido.el
diff -c emacs/lisp/ido.el:1.71 emacs/lisp/ido.el:1.72
*** emacs/lisp/ido.el:1.71      Sat Aug  6 22:13:43 2005
--- emacs/lisp/ido.el   Mon Aug 15 12:29:54 2005
***************
*** 1959,1965 ****
        (if (eq method 'insert)
            (progn
              (ido-record-command 'insert-buffer buf)
!             (insert-buffer buf))
          (ido-visit-buffer buf method t)))
  
         ;; buffer doesn't exist
--- 1959,1967 ----
        (if (eq method 'insert)
            (progn
              (ido-record-command '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,3022 ****
    (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))
        (quit
         (setq res t
             ido-try-merged-list nil
--- 3014,3023 ----
    (let (res)
      (message "Searching for `%s'...." text)
      (condition-case nil
!       (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