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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/04/11 13:34:14

Index: dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/dired.el,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -b -r1.385 -r1.386
--- dired.el    6 Apr 2008 20:58:20 -0000       1.385
+++ dired.el    11 Apr 2008 13:34:14 -0000      1.386
@@ -594,15 +594,12 @@
            ;; If a dialog is about to be used, call read-directory-name so
            ;; the dialog code knows we want directories.  Some dialogs can
            ;; only select directories or files when popped up, not both.
-           (if (next-read-file-uses-dialog-p)
-               (read-directory-name (format "Dired %s(directory): " str)
-                                    nil default-directory nil)
              (let ((default (and buffer-file-name
                                  (abbreviate-file-name buffer-file-name))))
                (minibuffer-with-setup-hook
                    (lambda () (setq minibuffer-default default))
-                 (read-file-name (format "Dired %s(directory): " str)
-                                 nil default-directory nil)))))))
+               (read-directory-name (format "Dired %s(directory): " str)
+                                    nil default-directory nil))))))
 
 ;;;###autoload (define-key ctl-x-map "d" 'dired)
 ;;;###autoload