procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Stefan Monnier 2008-04-11 13:34:14 +00:00
parent 23c2e0e4ab
commit da5a7abbc4
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -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.

13
lisp/dired.el
View file

@ -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