(dired-read-dir-and-switches): Fix up last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92bb56f539232929fc6e044acf2827279489c2f0..8b3d4af9215a24c2547ea84307f830403a74ce4d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
+2008-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * dired.el (dired-read-dir-and-switches): Fix up last change.
+
 2008-05-05  Eric S. Raymond  <esr@snark.thyrsus.com>
 
        * vc.el (vc-deduce-fileset): Lift all the policy and UI
-       stuff out of this function, move it to vc-dispatcher-selection-set.k
+       stuff out of this function, move it to vc-dispatcher-selection-set.
 
 2008-05-05  Sam Steingold  <sds@gnu.org>
 

diff --git a/lisp/dired.el b/lisp/dired.el
index e6c1dbd16c9e6be9dcb42122ba774d433a0a22da..c22e27fd95ec3b7cc74c3ac0505274608836ae91 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -606,9 +606,12 @@ Don't use that together with FILTER."
         (minibuffer-with-setup-hook
             (lambda ()
               (setq minibuffer-default default)
-              (setq minibuffer-completing-file-name t)
-              (setq completion-ignore-case
-                    read-file-name-completion-ignore-case)
+              (set (make-local-variable 'minibuffer-completing-file-name)
+                   ;; t means "from now until the next minibuffer", whereas
+                   ;; `lambda' means "only here".
+                   'lambda)
+              (set (make-local-variable 'completion-ignore-case)
+                   read-file-name-completion-ignore-case)
               (setq default-directory defdir))
           (substitute-in-file-name
            (completing-read