mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Replace many instances of read-file-name with read-directory-name.

Browse source 
* 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.
This commit is contained in:
Antoine Levitt 2011-03-05 16:56:00 -05:00 • committed by Chong Yidong
parent d23ae2b03f
commit 7e27ce9cdb
20 changed files with 93 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/vc/emerge.el
View file

@ -1271,10 +1271,10 @@ Otherwise, the A or B file present is copied to the output file."
(defun emerge-merge-directories (a-dir b-dir ancestor-dir output-dir)
(interactive
(list
(read-file-name "A directory: " nil nil 'confirm)
(read-file-name "B directory: " nil nil 'confirm)
(read-file-name "Ancestor directory (null for none): " nil nil 'confirm)
(read-file-name "Output directory (null for none): " nil nil 'confirm)))
(read-directory-name "A directory: " nil nil 'confirm)
(read-directory-name "B directory: " nil nil 'confirm)
(read-directory-name "Ancestor directory (null for none): " nil nil 'confirm)
(read-directory-name "Output directory (null for none): " nil nil 'confirm)))
;; Check that we're not on a line
(if (not (and (bolp) (eolp)))
(error "There is text on this line"))

6
lisp/vc/vc-dir.el
View file

@ -1185,9 +1185,9 @@ These are the commands available for use in the file status buffer:
;; therefore it makes sense to always do that.
;; Otherwise if you do C-x v d -> C-x C-f -> C-c v d
;; you may get a new *vc-dir* buffer, different from the original
(file-truename (read-file-name "VC status for directory: "
default-directory default-directory t
nil #'file-directory-p))
(file-truename (read-directory-name "VC status for directory: "
default-directory default-directory t
nil))
(if current-prefix-arg
(intern
(completing-read

4
lisp/vc/vc.el
View file

@ -1954,7 +1954,7 @@ checked out in that new branch."
;; For VC's that do not work at file level, it's pointless
;; to ask for a directory, branches are created at repository level.
default-directory
(read-file-name "Directory: " default-directory default-directory t))
(read-directory-name "Directory: " default-directory default-directory t))
(read-string (if current-prefix-arg "New branch name: " "New tag name: "))
current-prefix-arg)))
(message "Making %s... " (if branchp "branch" "tag"))
@ -1980,7 +1980,7 @@ allowed and simply skipped)."
;; For VC's that do not work at file level, it's pointless
;; to ask for a directory, branches are created at repository level.
default-directory
(read-file-name "Directory: " default-directory default-directory t))
(read-directory-name "Directory: " default-directory default-directory t))
(read-string "Tag name to retrieve (default latest revisions): "))))
(let ((update (yes-or-no-p "Update any affected buffers? "))
(msg (if (or (not name) (string= name ""))