aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier <[email protected]>2008-05-06 00:51:56 +0000
committerStefan Monnier <[email protected]>2008-05-06 00:51:56 +0000
commita8b0c38b6493b9f3e2bd5f67f9e778dfeaaeca75 (patch)
tree45213a7ad10b5c9f21eecbc3e049f255dfff172a
parentbe636037294fc681546f3b94d3b2e3e59bf0eedb (diff)
(dired-read-dir-and-switches): Fix up last change.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/dired.el9
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92bb56f539..8b3d4af921 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
+2008-05-06 Stefan Monnier <[email protected]>
+
+ * dired.el (dired-read-dir-and-switches): Fix up last change.
+
2008-05-05 Eric S. Raymond <[email protected]>
* 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 <[email protected]>
diff --git a/lisp/dired.el b/lisp/dired.el
index e6c1dbd16c..c22e27fd95 100644
--- 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