aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2006-09-29 12:25:35 +0000
committerKim F. Storm2006-09-29 12:25:35 +0000
commitd471b4fe3a15be8662322034229dd7bb3fd2233b (patch)
tree0281d768fed827810a7d27dfed47c094714fbe8a
parentf45b66b9783d9dd689f7b1f6840b88c0ba73667d (diff)
downloademacs-d471b4fe3a15be8662322034229dd7bb3fd2233b.tar.gz
emacs-d471b4fe3a15be8662322034229dd7bb3fd2233b.zip
(ido-file-internal): Only bind minibuffer-completing-file-name
to t while calling ido-read-internal.
-rw-r--r--lisp/ido.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ido.el b/lisp/ido.el
index 432347717f5..b68a4622ef8 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2224,7 +2224,6 @@ If INITIAL is non-nil, it specifies the initial input string."
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))
@@ -2268,9 +2267,10 @@ If INITIAL is non-nil, it specifies the initial input string."
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