[Emacs-diffs] Changes to emacs/lisp/ido.el,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/09/29 12:25:35

Index: ido.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ido.el,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- ido.el      14 Sep 2006 14:42:30 -0000      1.105
+++ ido.el      29 Sep 2006 12:25:35 -0000      1.106
@@ -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)
+       (let ((minibuffer-completing-file-name t))
        (setq filename (ido-read-internal item
                                          (or prompt "Find file: ")
-                                         'ido-file-history nil nil initial)))
+                                           'ido-file-history nil nil 
initial))))
 
       ;; Choose the file name: either the text typed in, or the head
       ;; of the list of matches