# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1207920854 0
# Node ID bae1479690d4b9f2aebdd0ea7682830baf231d4a
# Parent  96f9ff09bbb02c01bc167225569f6cf67a719c3f
(dired-read-dir-and-switches): Use read-directory-name even for non-dialogs.

diff -r 96f9ff09bbb0 -r bae1479690d4 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Apr 11 13:27:14 2008 +0000
+++ b/lisp/ChangeLog	Fri Apr 11 13:34:14 2008 +0000
@@ -1,5 +1,8 @@
 2008-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* dired.el (dired-read-dir-and-switches): Use read-directory-name even
+	for non-dialogs.
+
 	* Makefile.in (bootstrap-prepare): Don't copy ldefs-boot over loaddefs.
 	* loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist.
 
diff -r 96f9ff09bbb0 -r bae1479690d4 lisp/dired.el
--- a/lisp/dired.el	Fri Apr 11 13:27:14 2008 +0000
+++ b/lisp/dired.el	Fri Apr 11 13:34:14 2008 +0000
@@ -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)
+	    (let ((default (and buffer-file-name
+				(abbreviate-file-name buffer-file-name))))
+	      (minibuffer-with-setup-hook
+		  (lambda () (setq minibuffer-default default))
 		(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)))))))
+				     nil default-directory nil))))))
 
 ;;;###autoload (define-key ctl-x-map "d" 'dired)
 ;;;###autoload