Mercurial > emacs
comparison lisp/ido.el @ 73166:7e2d2b8518f4
(ido-file-internal): Only bind minibuffer-completing-file-name
to t while calling ido-read-internal.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Fri, 29 Sep 2006 12:25:35 +0000 |
parents | 299c5f25649b |
children | 4dce8f520712 bb0e318b7c53 |
comparison
equal
deleted
inserted
replaced
73165:deaec6fc4933 | 73166:7e2d2b8518f4 |
---|---|
2222 (unless item | 2222 (unless item |
2223 (setq item 'file)) | 2223 (setq item 'file)) |
2224 (let ((ido-current-directory (ido-expand-directory default)) | 2224 (let ((ido-current-directory (ido-expand-directory default)) |
2225 (ido-context-switch-command switch-cmd) | 2225 (ido-context-switch-command switch-cmd) |
2226 ido-directory-nonreadable ido-directory-too-big | 2226 ido-directory-nonreadable ido-directory-too-big |
2227 (minibuffer-completing-file-name t) | |
2228 filename) | 2227 filename) |
2229 | 2228 |
2230 (if (or (not ido-mode) (ido-is-slow-ftp-host)) | 2229 (if (or (not ido-mode) (ido-is-slow-ftp-host)) |
2231 (setq filename t | 2230 (setq filename t |
2232 ido-exit 'fallback) | 2231 ido-exit 'fallback) |
2266 (ido-work-file-index -1) | 2265 (ido-work-file-index -1) |
2267 (ido-find-literal nil)) | 2266 (ido-find-literal nil)) |
2268 | 2267 |
2269 (unless filename | 2268 (unless filename |
2270 (setq ido-saved-vc-hb vc-handled-backends) | 2269 (setq ido-saved-vc-hb vc-handled-backends) |
2271 (setq filename (ido-read-internal item | 2270 (let ((minibuffer-completing-file-name t)) |
2272 (or prompt "Find file: ") | 2271 (setq filename (ido-read-internal item |
2273 'ido-file-history nil nil initial))) | 2272 (or prompt "Find file: ") |
2273 'ido-file-history nil nil initial)))) | |
2274 | 2274 |
2275 ;; Choose the file name: either the text typed in, or the head | 2275 ;; Choose the file name: either the text typed in, or the head |
2276 ;; of the list of matches | 2276 ;; of the list of matches |
2277 | 2277 |
2278 (cond | 2278 (cond |