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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/05/13 16:18:19

Index: dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired.el,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -b -r1.398 -r1.399
--- dired.el    13 May 2008 08:39:54 -0000      1.398
+++ dired.el    13 May 2008 16:18:17 -0000      1.399
@@ -598,16 +598,14 @@
     (if (next-read-file-uses-dialog-p)
         (read-directory-name (format "Dired %s(directory): " str)
                              nil default-directory nil)
-      (lexical-let ((default (and buffer-file-name
-                                  (abbreviate-file-name buffer-file-name)))
-                    (cie ()))
+      (let ((cie ()))
         (dolist (ext completion-ignored-extensions)
           (if (eq ?/ (aref ext (1- (length ext)))) (push ext cie)))
         (setq cie (concat (regexp-opt cie "\\(?:") "\\'"))
-        (minibuffer-with-setup-hook
-            (lambda ()
-              (setq minibuffer-default default)
-              (setq minibuffer-completion-table
+        (lexical-let* ((default (and buffer-file-name
+                                     (abbreviate-file-name buffer-file-name)))
+                       (cie cie)
+                       (completion-table
                     ;; We need a mix of read-file-name and
                     ;; read-directory-name so that completion to directories
                     ;; is preferred, but if the user wants to enter a global
@@ -621,15 +619,20 @@
                     (completion-table-in-turn
                      (lambda (str pred action)
                        (let ((read-file-name-predicate
-                              (lambda (f) (and (not (member f '("./" "../")))
+                                  (lambda (f)
+                                    (and (not (member f '("./" "../")))
                                           ;; Hack! Faster than 
file-directory-p!
                                           (eq (aref f (1- (length f))) ?/)
                                           (not (string-match cie f))))))
                          (complete-with-action
                           action 'read-file-name-internal str nil)))
                      'read-file-name-internal)))
+          (minibuffer-with-setup-hook
+              (lambda ()
+                (setq minibuffer-default default)
+                (setq minibuffer-completion-table completion-table))
           (read-file-name (format "Dired %s(directory): " str)
-                          nil default-directory nil)))))))
+                            nil default-directory nil))))))))
 
 ;;;###autoload (define-key ctl-x-map "d" 'dired)
 ;;;###autoload