Mercurial > emacs
changeset 94002:bae1479690d4
(dired-read-dir-and-switches): Use read-directory-name even for non-dialogs.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 11 Apr 2008 13:34:14 +0000 |
| parents | 96f9ff09bbb0 |
| children | 2ecb2ea8d5b5 |
| files | lisp/ChangeLog lisp/dired.el |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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