/[emacs]/emacs/lisp/ido.el
ViewVC logotype

Diff of /emacs/lisp/ido.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.71 by ttn, Sat Aug 6 22:13:43 2005 UTC revision 1.72 by kfstorm, Mon Aug 15 12:29:54 2005 UTC
# Line 1959  If INITIAL is non-nil, it specifies the Line 1959  If INITIAL is non-nil, it specifies the
1959          (if (eq method 'insert)          (if (eq method 'insert)
1960              (progn              (progn
1961                (ido-record-command 'insert-buffer buf)                (ido-record-command 'insert-buffer buf)
1962                (insert-buffer buf))                (with-no-warnings
1963                    ;; we really want to run insert-buffer here
1964                    (insert-buffer buf)))
1965            (ido-visit-buffer buf method t)))            (ido-visit-buffer buf method t)))
1966    
1967         ;; buffer doesn't exist         ;; buffer doesn't exist
# Line 3012  for first matching file." Line 3014  for first matching file."
3014    (let (res)    (let (res)
3015      (message "Searching for `%s'...." text)      (message "Searching for `%s'...." text)
3016      (condition-case nil      (condition-case nil
3017          (unless (catch 'input-pending-p          (if (eq t (setq res
3018                    (let ((throw-on-input 'input-pending-p))                          (while-no-input
3019                      (setq res (ido-make-merged-file-list-1 text auto wide))                            (ido-make-merged-file-list-1 text auto wide))))
3020                      t))              (setq res 'input-pending-p))
           (setq res 'input-pending-p))  
3021        (quit        (quit
3022         (setq res t         (setq res t
3023               ido-try-merged-list nil               ido-try-merged-list nil

Legend:
Removed from v.1.71  
changed lines
  Added in v.1.72

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26