Mercurial > emacs

diff lisp/ido.el @ 90609:bb0e318b7c53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 447-459) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 141-144) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-115
author Miles Bader <miles@gnu.org>
date Tue, 03 Oct 2006 05:04:21 +0000
parents b5c13d1564a9 7e2d2b8518f4
children 8dd8c8286063
line wrap: on
line diff
--- a/lisp/ido.el	Mon Oct 02 08:05:25 2006 +0000
+++ b/lisp/ido.el	Tue Oct 03 05:04:21 2006 +0000
@@ -2224,7 +2224,6 @@
   (let ((ido-current-directory (ido-expand-directory default))
 	(ido-context-switch-command switch-cmd)
 	ido-directory-nonreadable ido-directory-too-big
-	(minibuffer-completing-file-name t)
 	filename)
 
     (if (or (not ido-mode) (ido-is-slow-ftp-host))
@@ -2268,9 +2267,10 @@
 
       (unless filename
 	(setq ido-saved-vc-hb vc-handled-backends)
-	(setq filename (ido-read-internal item
-					  (or prompt "Find file: ")
-					  'ido-file-history nil nil initial)))
+	(let ((minibuffer-completing-file-name t))
+	  (setq filename (ido-read-internal item
+					    (or prompt "Find file: ")
+					    'ido-file-history nil nil initial))))
 
       ;; Choose the file name: either the text typed in, or the head
       ;; of the list of matches