[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 08:39:55

Index: dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired.el,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -b -r1.397 -r1.398
--- dired.el    13 May 2008 05:15:57 -0000      1.397
+++ dired.el    13 May 2008 08:39:54 -0000      1.398
@@ -600,7 +600,6 @@
                              nil default-directory nil)
       (lexical-let ((default (and buffer-file-name
                                   (abbreviate-file-name buffer-file-name)))
-                    (defdir default-directory)
                     (cie ()))
         (dolist (ext completion-ignored-extensions)
           (if (eq ?/ (aref ext (1- (length ext)))) (push ext cie)))
@@ -608,20 +607,12 @@
         (minibuffer-with-setup-hook
             (lambda ()
               (setq minibuffer-default default)
-              (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
-            (format "Dired %s(directory): " str)
-            ;; 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 pattern, he can still
-            ;; use completion on filenames to help him write the pattern.
+              (setq minibuffer-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
+                    ;; pattern, he can still use completion on filenames to
+                    ;; help him write the pattern.
             ;; Essentially, we want to use
             ;; (completion-table-with-predicate
             ;;  'read-file-name-internal 'file-directory-p nil)
@@ -636,8 +627,9 @@
                                   (not (string-match cie f))))))
                  (complete-with-action
                   action 'read-file-name-internal str nil)))
-             'read-file-name-internal)
-            nil nil (abbreviate-file-name defdir) 'file-name-history))))))))
+                     'read-file-name-internal)))
+          (read-file-name (format "Dired %s(directory): " str)
+                          nil default-directory nil)))))))
 
 ;;;###autoload (define-key ctl-x-map "d" 'dired)
 ;;;###autoload