comparison lisp/ido.el @ 64343:6e19d6e25256

(ido-file-internal, ido-read-file-name, ido-read-directory-name): Let bind minibuffer-completing-file-name to t.
author Kim F. Storm <storm@cua.dk>
date Fri, 15 Jul 2005 13:09:03 +0000
parents e461e45e6f66
children 2b7f6da0c696
comparison
equal deleted inserted replaced
64342:4546132eb60b 64343:6e19d6e25256
2021 ;; Internal function for ido-find-file and friends 2021 ;; Internal function for ido-find-file and friends
2022 (unless item 2022 (unless item
2023 (setq item 'file)) 2023 (setq item 'file))
2024 (let ((ido-current-directory (ido-expand-directory default)) 2024 (let ((ido-current-directory (ido-expand-directory default))
2025 (ido-context-switch-command switch-cmd) 2025 (ido-context-switch-command switch-cmd)
2026 ido-directory-nonreadable ido-directory-too-big 2026 ido-directory-nonreadable ido-directory-too-big
2027 (minibuffer-completing-file-name t)
2027 filename) 2028 filename)
2028 2029
2029 (if (or (not ido-mode) (ido-is-slow-ftp-host)) 2030 (if (or (not ido-mode) (ido-is-slow-ftp-host))
2030 (setq filename t 2031 (setq filename t
2031 ido-exit 'fallback) 2032 ido-exit 'fallback)
4248 (or (null predicate) (eq predicate 'file-exists-p))) 4249 (or (null predicate) (eq predicate 'file-exists-p)))
4249 (let* (ido-saved-vc-hb 4250 (let* (ido-saved-vc-hb
4250 (ido-context-switch-command 4251 (ido-context-switch-command
4251 (if (eq (get this-command 'ido) 'find-file) nil 'ignore)) 4252 (if (eq (get this-command 'ido) 'find-file) nil 'ignore))
4252 (vc-handled-backends (and (boundp 'vc-handled-backends) vc-handled-backends)) 4253 (vc-handled-backends (and (boundp 'vc-handled-backends) vc-handled-backends))
4254 (minibuffer-completing-file-name t)
4253 (ido-current-directory (ido-expand-directory dir)) 4255 (ido-current-directory (ido-expand-directory dir))
4254 (ido-directory-nonreadable (not (file-readable-p ido-current-directory))) 4256 (ido-directory-nonreadable (not (file-readable-p ido-current-directory)))
4255 (ido-directory-too-big (and (not ido-directory-nonreadable) 4257 (ido-directory-too-big (and (not ido-directory-nonreadable)
4256 (ido-directory-too-big-p ido-current-directory))) 4258 (ido-directory-too-big-p ido-current-directory)))
4257 (ido-work-directory-index -1) 4259 (ido-work-directory-index -1)
4280 (defun ido-read-directory-name (prompt &optional dir default-dirname mustmatch initial) 4282 (defun ido-read-directory-name (prompt &optional dir default-dirname mustmatch initial)
4281 "Ido replacement for the built-in `read-directory-name'. 4283 "Ido replacement for the built-in `read-directory-name'.
4282 Read directory name, prompting with PROMPT and completing in directory DIR. 4284 Read directory name, prompting with PROMPT and completing in directory DIR.
4283 See `read-directory-name' for additional parameters." 4285 See `read-directory-name' for additional parameters."
4284 (let* (filename 4286 (let* (filename
4287 (minibuffer-completing-file-name t)
4285 (ido-context-switch-command 'ignore) 4288 (ido-context-switch-command 'ignore)
4286 ido-saved-vc-hb 4289 ido-saved-vc-hb
4287 (ido-current-directory (ido-expand-directory dir)) 4290 (ido-current-directory (ido-expand-directory dir))
4288 (ido-directory-nonreadable (not (file-readable-p ido-current-directory))) 4291 (ido-directory-nonreadable (not (file-readable-p ido-current-directory)))
4289 (ido-directory-too-big (and (not ido-directory-nonreadable) 4292 (ido-directory-too-big (and (not ido-directory-nonreadable)