mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-18 03:40:47 -08:00
Code Issues Projects Releases Wiki Activity

(dired-read-dir-and-switches): Replace last change with

Browse source 
a new approach that mixes read-file-name and read-directory-name.
This commit is contained in:
Stefan Monnier 2008-04-29 14:48:57 +00:00
parent 28bb43e10f
commit b95ced6bee
2 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2008-04-29 Stefan Monnier <monnier@iro.umontreal.ca> 2008-04-29 Stefan Monnier <monnier@iro.umontreal.ca>
* dired.el (dired-read-dir-and-switches): Replace last change with
a new approach that mixes read-file-name and read-directory-name.
* files.el (read-buffer-to-switch): * files.el (read-buffer-to-switch):
Avoid making assumptions about `other-buffer'. Avoid making assumptions about `other-buffer'.

32
lisp/dired.el
View file

@ -594,12 +594,34 @@ 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.
(let ((default (and buffer-file-name (if (next-read-file-uses-dialog-p)
(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)
(lexical-let ((default (and buffer-file-name
(abbreviate-file-name buffer-file-name)))
(defdir default-directory))
(minibuffer-with-setup-hook
(lambda ()
(setq minibuffer-default default)
(setq default-directory defdir))
(completing-read
(format "Dired %s(directory): " str)
;; We need a mix of read-file-name and read-directory-name
;; so that completion to directories is preferred, but if
;; the user wants to enter a global pattern, he can still
;; use completion on filenames to help him write the pattern.
;; Essentially, we want to use
;; (completion-table-with-predicate
;; 'read-file-name-internal 'file-directory-p nil)
;; but that doesn't work because read-file-name-internal
;; does not obey its `predicate' argument.
(completion-table-in-turn
(lambda (str pred action)
(let ((read-file-name-predicate 'file-directory-p))
(complete-with-action
action 'read-file-name-internal str nil)))
'read-file-name-internal)
nil nil (abbreviate-file-name defdir) 'file-name-history)))))))
;;;###autoload (define-key ctl-x-map "d" 'dired) ;;;###autoload (define-key ctl-x-map "d" 'dired)
;;;###autoload ;;;###autoload