summaryrefslogtreecommitdiff
path: root/lisp/dired.el
diff options
context:
space:
mode:
authorAntoine Levitt <antoine.levitt@gmail.com>2011-03-05 16:56:00 -0500
committerChong Yidong <cyd@stupidchicken.com>2011-03-05 16:56:00 -0500
commit7e27ce9cdb691909a33667d5e2b186d23bb7c9c4 (patch)
treea011c85b6cc5791699d8c726f461f1acf39eb21b /lisp/dired.el
parentd23ae2b03fdaaf6ff2015f177c0770792c409d96 (diff)
downloademacs-7e27ce9cdb691909a33667d5e2b186d23bb7c9c4.tar.gz
Replace many instances of read-file-name with read-directory-name.
* lisp/files.el (delete-directory, copy-directory, list-directory): Use read-directory-name. * lisp/find-file.el (ff-find-the-other-file): * lisp/net/ange-ftp.el (ange-ftp-make-directory): * lisp/printing.el (pr-interactive-dir): * lisp/progmodes/ada-prj.el (ada-prj-load-directory): * lisp/progmodes/ebnf2ps.el (ebnf-print-directory) (ebnf-spool-directory, ebnf-eps-directory) (ebnf-syntax-directory): * lisp/shell.el (shell): * lisp/speedbar.el (speedbar-create-directory): * lisp/vc/emerge.el (emerge-merge-directories): * lisp/vc/vc-dir.el (vc-dir): * lisp/vc/vc.el (vc-create-tag, vc-retrieve-tag): Likewise. * lisp/gnus.el (gnus-interactive): Use read-directory-name. * lisp/gnus-uu.el (gnus-uu-decode-uu-and-save) (gnus-uu-decode-unshar-and-save, gnus-uu-decode-save) (gnus-uu-decode-binhex, gnus-uu-decode-yenc) (gnus-uu-decode-save-view, gnus-uu-decode-postscript-and-save): Likewise. * lisp/mh-funcs.el (mh-store-msg, mh-store-buffer): * lisp/mh-mime.el (mh-mime-save-parts): Use read-directory-name. * lisp/dired.el: Clarify comment.
Diffstat (limited to 'lisp/dired.el')
-rw-r--r--lisp/dired.el11
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/dired.el b/lisp/dired.el
index 99902d15e33..c4374503a6f 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -611,9 +611,12 @@ Don't use that together with FILTER."
(if current-prefix-arg
(read-string "Dired listing switches: "
dired-listing-switches))
- ;; 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 a dialog is 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 no dialog is used, call `read-file-name'
+ ;; because the user may want completion of file names for
+ ;; use in a wildcard pattern.
(if (next-read-file-uses-dialog-p)
(read-directory-name (format "Dired %s(directory): " str)
nil default-directory nil)
@@ -4083,7 +4086,7 @@ true then the type of the file linked to by FILE is printed instead.
;;;***
;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
-;;;;;; "dired-x" "dired-x.el" "addd55345656d18cfd5251790a655e2c")
+;;;;;; "dired-x" "dired-x.el" "87fd4ae2fdade7e0f11c4a0b1cfdeda2")
;;; Generated autoloads from dired-x.el
(autoload 'dired-jump "dired-x" "\