Commit da5a7abb authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(dired-read-dir-and-switches): Use read-directory-name even for non-dialogs.

parent 23c2e0e4
2008-04-11 Stefan Monnier <monnier@iro.umontreal.ca> 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. * Makefile.in (bootstrap-prepare): Don't copy ldefs-boot over loaddefs.
* loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist. * loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist.
   
......
...@@ -594,15 +594,12 @@ Don't use that together with FILTER." ...@@ -594,15 +594,12 @@ Don't use that together with FILTER."
;; If a dialog is about to be used, call read-directory-name so ;; If a dialog is about to be used, call read-directory-name so
;; the dialog code knows we want directories. Some dialogs can ;; the dialog code knows we want directories. Some dialogs can
;; only select directories or files when popped up, not both. ;; 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) (read-directory-name (format "Dired %s(directory): " str)
nil default-directory nil) 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)))))))
;;;###autoload (define-key ctl-x-map "d" 'dired) ;;;###autoload (define-key ctl-x-map "d" 'dired)
;;;###autoload ;;;###autoload
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment