Mercurial > emacs
comparison lisp/ido.el @ 64983:1a1aa1eae3b3
(ido-buffer-internal): Use with-no-warnings.
(ido-make-merged-file-list): Use while-no-input.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Mon, 15 Aug 2005 12:29:54 +0000 |
parents | 41bb365f41c4 |
children | 70976e57cb56 |
comparison
equal
deleted
inserted
replaced
64982:d912e5d238ec | 64983:1a1aa1eae3b3 |
---|---|
1957 ;; View buffer if it exists | 1957 ;; View buffer if it exists |
1958 ((get-buffer buf) | 1958 ((get-buffer buf) |
1959 (if (eq method 'insert) | 1959 (if (eq method 'insert) |
1960 (progn | 1960 (progn |
1961 (ido-record-command 'insert-buffer buf) | 1961 (ido-record-command 'insert-buffer buf) |
1962 (insert-buffer buf)) | 1962 (with-no-warnings |
1963 ;; we really want to run insert-buffer here | |
1964 (insert-buffer buf))) | |
1963 (ido-visit-buffer buf method t))) | 1965 (ido-visit-buffer buf method t))) |
1964 | 1966 |
1965 ;; buffer doesn't exist | 1967 ;; buffer doesn't exist |
1966 ((eq ido-create-new-buffer 'never) | 1968 ((eq ido-create-new-buffer 'never) |
1967 (message "no buffer matching `%s'" buf)) | 1969 (message "no buffer matching `%s'" buf)) |
3010 | 3012 |
3011 (defun ido-make-merged-file-list (text auto wide) | 3013 (defun ido-make-merged-file-list (text auto wide) |
3012 (let (res) | 3014 (let (res) |
3013 (message "Searching for `%s'...." text) | 3015 (message "Searching for `%s'...." text) |
3014 (condition-case nil | 3016 (condition-case nil |
3015 (unless (catch 'input-pending-p | 3017 (if (eq t (setq res |
3016 (let ((throw-on-input 'input-pending-p)) | 3018 (while-no-input |
3017 (setq res (ido-make-merged-file-list-1 text auto wide)) | 3019 (ido-make-merged-file-list-1 text auto wide)))) |
3018 t)) | 3020 (setq res 'input-pending-p)) |
3019 (setq res 'input-pending-p)) | |
3020 (quit | 3021 (quit |
3021 (setq res t | 3022 (setq res t |
3022 ido-try-merged-list nil | 3023 ido-try-merged-list nil |
3023 ido-use-merged-list nil))) | 3024 ido-use-merged-list nil))) |
3024 (when (and res (listp res)) | 3025 (when (and res (listp res)) |