diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-04-11 13:34:14 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-04-11 13:34:14 +0000 |
| commit | da5a7abbc428c5db1dd5660f61e76719e99b4ce1 (patch) | |
| tree | 0a984af1203aaf426057326ac8641e126d548a21 /lisp/dired.el | |
| parent | 23c2e0e4abdaa4c46f4feb21e0d69f28151730f0 (diff) | |
| download | emacs-da5a7abbc428c5db1dd5660f61e76719e99b4ce1.tar.gz | |
(dired-read-dir-and-switches): Use read-directory-name even for non-dialogs.
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 4ba6c958b11..faa048373e7 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -594,15 +594,12 @@ Don't use that together with FILTER." ;; 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 |