[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103536: Replace many instances of re
|
From: |
Chong Yidong |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103536: Replace many instances of read-file-name with read-directory-name. |
|
Date: |
Sat, 05 Mar 2011 16:56:00 -0500 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103536
author: Antoine Levitt <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-03-05 16:56:00 -0500
message:
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.
modified:
lisp/ChangeLog
lisp/dired.el
lisp/files.el
lisp/find-file.el
lisp/gnus/ChangeLog
lisp/gnus/gnus-group.el
lisp/gnus/gnus-uu.el
lisp/gnus/gnus.el
lisp/mh-e/ChangeLog
lisp/mh-e/mh-funcs.el
lisp/mh-e/mh-mime.el
lisp/net/ange-ftp.el
lisp/printing.el
lisp/progmodes/ada-prj.el
lisp/progmodes/ebnf2ps.el
lisp/shell.el
lisp/speedbar.el
lisp/vc/emerge.el
lisp/vc/vc-dir.el
lisp/vc/vc.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-03-05 21:10:03 +0000
+++ b/lisp/ChangeLog 2011-03-05 21:56:00 +0000
@@ -1,3 +1,21 @@
+2011-03-05 Antoine Levitt <address@hidden>
+
+ * files.el (delete-directory, copy-directory, list-directory): Use
+ read-directory-name.
+
+ * find-file.el (ff-find-the-other-file):
+ * net/ange-ftp.el (ange-ftp-make-directory):
+ * printing.el (pr-interactive-dir):
+ * progmodes/ada-prj.el (ada-prj-load-directory):
+ * progmodes/ebnf2ps.el (ebnf-print-directory)
+ (ebnf-spool-directory, ebnf-eps-directory)
+ (ebnf-syntax-directory):
+ * shell.el (shell):
+ * speedbar.el (speedbar-create-directory):
+ * vc/emerge.el (emerge-merge-directories):
+ * vc/vc-dir.el (vc-dir):
+ * vc/vc.el (vc-create-tag, vc-retrieve-tag): Likewise.
+
2011-03-05 Chong Yidong <address@hidden>
* help-mode.el (help-buffer): If we are to return the current
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2011-03-02 10:42:47 +0000
+++ b/lisp/dired.el 2011-03-05 21:56:00 +0000
@@ -611,9 +611,12 @@
(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 @@
;;;***
;;;### (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" "\
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2011-03-05 20:35:08 +0000
+++ b/lisp/files.el 2011-03-05 21:56:00 +0000
@@ -4831,7 +4831,7 @@
(let* ((trashing (and delete-by-moving-to-trash
(null current-prefix-arg)))
(dir (expand-file-name
- (read-file-name
+ (read-directory-name
(if trashing
"Move directory to trash: "
"Delete directory: ")
@@ -4899,7 +4899,7 @@
(let ((dir (read-directory-name
"Copy directory: " default-directory default-directory t nil)))
(list dir
- (read-file-name
+ (read-directory-name
(format "Copy directory %s to: " dir)
default-directory default-directory nil nil)
current-prefix-arg t nil)))
@@ -5598,7 +5598,7 @@
Actions controlled by variables `list-directory-brief-switches'
and `list-directory-verbose-switches'."
(interactive (let ((pfx current-prefix-arg))
- (list (read-file-name (if pfx "List directory (verbose): "
+ (list (read-directory-name (if pfx "List directory (verbose): "
"List directory (brief): ")
nil default-directory nil)
pfx)))
=== modified file 'lisp/find-file.el'
--- a/lisp/find-file.el 2011-03-03 08:03:01 +0000
+++ b/lisp/find-file.el 2011-03-05 21:56:00 +0000
@@ -494,7 +494,7 @@
(setq name
(expand-file-name
- (read-file-name
+ (read-directory-name
(format "Find or create %s in: " default-name)
default-directory default-name nil)))
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-03-05 13:01:56 +0000
+++ b/lisp/gnus/ChangeLog 2011-03-05 21:56:00 +0000
@@ -1,3 +1,15 @@
+2011-03-05 Antoine Levitt <address@hidden>
+
+ * gnus.el (gnus-interactive): Use read-directory-name.
+
+ * 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.
+
+ * gnus-group.el (gnus-group-make-directory-group): Likewise.
+
2011-03-05 Lars Magne Ingebrigtsen <address@hidden>
* gnus-sum.el (gnus-update-read-articles): Fix typo.
=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el 2011-02-27 08:20:21 +0000
+++ b/lisp/gnus/gnus-group.el 2011-03-05 21:56:00 +0000
@@ -3102,7 +3102,7 @@
directory will be used as a newsgroup. The directory should contain
mail messages or news articles in files that have numeric names."
(interactive
- (list (read-file-name "Create group from directory: ")))
+ (list (read-directory-name "Create group from directory: ")))
(unless (file-exists-p dir)
(error "No such directory"))
(unless (file-directory-p dir)
=== modified file 'lisp/gnus/gnus-uu.el'
--- a/lisp/gnus/gnus-uu.el 2011-01-26 08:36:39 +0000
+++ b/lisp/gnus/gnus-uu.el 2011-03-05 21:56:00 +0000
@@ -366,7 +366,7 @@
(interactive
(list current-prefix-arg
(file-name-as-directory
- (read-file-name "Uudecode and save in dir: "
+ (read-directory-name "Uudecode and save in dir: "
gnus-uu-default-dir
gnus-uu-default-dir t))))
(gnus-uu-decode-with-method 'gnus-uu-uustrip-article n dir nil nil t))
@@ -381,7 +381,7 @@
(interactive
(list current-prefix-arg
(file-name-as-directory
- (read-file-name "Unshar and save in dir: "
+ (read-directory-name "Unshar and save in dir: "
gnus-uu-default-dir
gnus-uu-default-dir t))))
(gnus-uu-decode-with-method 'gnus-uu-unshar-article n dir nil 'scan t))
@@ -390,12 +390,11 @@
"Saves the current article."
(interactive
(list current-prefix-arg
- (read-file-name
- (if gnus-uu-save-separate-articles
- "Save articles in dir: "
- "Save articles in file: ")
- gnus-uu-default-dir
- gnus-uu-default-dir)))
+ (if gnus-uu-save-separate-articles
+ (read-directory-name
+ "Save articles in dir: " gnus-uu-default-dir gnus-uu-default-dir)
+ (read-file-name-name
+ "Save article in file: " gnus-uu-default-dir gnus-uu-default-dir))))
(setq gnus-uu-saved-article-name file)
(gnus-uu-decode-with-method 'gnus-uu-save-article n nil t))
@@ -404,7 +403,7 @@
(interactive
(list current-prefix-arg
(file-name-as-directory
- (read-file-name "Unbinhex and save in dir: "
+ (read-directory-name "Unbinhex and save in dir: "
gnus-uu-default-dir
gnus-uu-default-dir))))
(setq gnus-uu-binhex-article-name
@@ -416,7 +415,7 @@
(interactive
(list current-prefix-arg
(file-name-as-directory
- (read-file-name "yEnc decode and save in dir: "
+ (read-directory-name "yEnc decode and save in dir: "
gnus-uu-default-dir
gnus-uu-default-dir))))
(setq gnus-uu-yenc-article-name nil)
@@ -458,10 +457,11 @@
"Saves and views the current article."
(interactive
(list current-prefix-arg
- (read-file-name (if gnus-uu-save-separate-articles
- "Save articles is dir: "
- "Save articles in file: ")
- gnus-uu-default-dir gnus-uu-default-dir)))
+ (if gnus-uu-save-separate-articles
+ (read-directory-name "Save articles in dir: "
+ gnus-uu-default-dir gnus-uu-default-dir)
+ (read-file-name "Save articles in file: "
+ gnus-uu-default-dir gnus-uu-default-dir))))
(let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
(gnus-uu-decode-save n file)))
@@ -742,7 +742,7 @@
(interactive
(list current-prefix-arg
(file-name-as-directory
- (read-file-name "Save in dir: "
+ (read-directory-name "Save in dir: "
gnus-uu-default-dir
gnus-uu-default-dir t))))
(gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article
=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2011-03-05 13:01:56 +0000
+++ b/lisp/gnus/gnus.el 2011-03-05 21:56:00 +0000
@@ -3268,7 +3268,7 @@
((= c ?d)
(point))
((= c ?D)
- (read-file-name prompt nil default-directory 'lambda))
+ (read-directory-name prompt nil default-directory 'lambda))
((= c ?f)
(read-file-name prompt nil nil 'lambda))
((= c ?F)
=== modified file 'lisp/mh-e/ChangeLog'
--- a/lisp/mh-e/ChangeLog 2011-01-25 04:08:28 +0000
+++ b/lisp/mh-e/ChangeLog 2011-03-05 21:56:00 +0000
@@ -1,3 +1,8 @@
+2011-03-05 Antoine Levitt <address@hidden>
+
+ * mh-funcs.el (mh-store-msg, mh-store-buffer):
+ * mh-mime.el (mh-mime-save-parts): Use read-directory-name.
+
2011-01-13 Chong Yidong <address@hidden>
* mh-comp.el (mh-user-agent-compose): New arg RETURN-ACTION.
=== modified file 'lisp/mh-e/mh-funcs.el'
--- a/lisp/mh-e/mh-funcs.el 2011-01-26 08:36:39 +0000
+++ b/lisp/mh-e/mh-funcs.el 2011-03-05 21:56:00 +0000
@@ -286,7 +286,7 @@
storing the content of these messages."
(interactive (list (let ((udir (or mh-store-default-directory
default-directory)))
- (read-file-name "Store message in directory: "
+ (read-directory-name "Store message in directory: "
udir udir nil))))
(let ((msg-file-to-store (mh-msg-filename (mh-get-msg-num t))))
(with-current-buffer (get-buffer-create mh-temp-buffer)
@@ -300,7 +300,7 @@
See `mh-store-msg' for a description of DIRECTORY."
(interactive (list (let ((udir (or mh-store-default-directory
default-directory)))
- (read-file-name "Store buffer in directory: "
+ (read-directory-name "Store buffer in directory: "
udir udir nil))))
(let ((store-directory (expand-file-name directory))
(sh-start (save-excursion
=== modified file 'lisp/mh-e/mh-mime.el'
--- a/lisp/mh-e/mh-mime.el 2011-01-25 04:08:28 +0000
+++ b/lisp/mh-e/mh-mime.el 2011-03-05 21:56:00 +0000
@@ -390,11 +390,11 @@
(equal nil mh-mime-save-parts-default-directory)
(equal t mh-mime-save-parts-default-directory))
(not mh-mime-save-parts-directory))
- (read-file-name "Store in directory: " nil nil t nil))
+ (read-directory-name "Store in directory: " nil nil t))
((and (or prompt
(equal t mh-mime-save-parts-default-directory))
mh-mime-save-parts-directory)
- (read-file-name (format
+ (read-directory-name (format
"Store in directory (default %s): "
mh-mime-save-parts-directory)
"" mh-mime-save-parts-directory t ""))
=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el 2011-01-26 08:36:39 +0000
+++ b/lisp/net/ange-ftp.el 2011-03-05 21:56:00 +0000
@@ -4071,7 +4071,7 @@
(ange-ftp-get-files dir t))))
(defun ange-ftp-make-directory (dir &optional parents)
- (interactive (list (expand-file-name (read-file-name "Make directory: "))))
+ (interactive (list (expand-file-name (read-directory-name "Make directory:
"))))
(if parents
(let ((parent (file-name-directory (directory-file-name dir))))
(or (file-exists-p parent)
=== modified file 'lisp/printing.el'
--- a/lisp/printing.el 2011-01-25 04:08:28 +0000
+++ b/lisp/printing.el 2011-03-05 21:56:00 +0000
@@ -5707,8 +5707,8 @@
(let* ((dir-name (file-name-directory (or (buffer-file-name)
default-directory)))
(fmt-prompt (concat "%s[" mess "] Directory to print: "))
- (dir (read-file-name (format fmt-prompt "")
- "" dir-name nil dir-name))
+ (dir (read-directory-name (format fmt-prompt "")
+ "" dir-name nil dir-name))
prompt)
(while (cond ((not (file-directory-p dir))
(ding)
@@ -5718,8 +5718,8 @@
(setq prompt "Directory is unreadable! "))
(t nil))
(setq dir-name (file-name-directory dir)
- dir (read-file-name (format fmt-prompt prompt)
- "" dir-name nil dir-name)))
+ dir (read-directory-name (format fmt-prompt prompt)
+ "" dir-name nil dir-name)))
(file-name-as-directory dir)))
=== modified file 'lisp/progmodes/ada-prj.el'
--- a/lisp/progmodes/ada-prj.el 2011-01-25 04:08:28 +0000
+++ b/lisp/progmodes/ada-prj.el 2011-03-05 21:56:00 +0000
@@ -227,7 +227,7 @@
;; the user to select a directory
(let ((use-dialog-box nil))
(unless file-name
- (set 'file-name (read-file-name "Root directory: " nil nil t))))
+ (set 'file-name (read-directory-name "Root directory: " nil nil t))))
(set 'ada-prj-current-values
(plist-put ada-prj-current-values
=== modified file 'lisp/progmodes/ebnf2ps.el'
--- a/lisp/progmodes/ebnf2ps.el 2011-01-25 04:08:28 +0000
+++ b/lisp/progmodes/ebnf2ps.el 2011-03-05 21:56:00 +0000
@@ -2229,8 +2229,8 @@
See also `ebnf-print-buffer'."
(interactive
- (list (read-file-name "Directory containing EBNF files (print): "
- nil default-directory)))
+ (list (read-directory-name "Directory containing EBNF files (print): "
+ nil default-directory)))
(ebnf-log-header "(ebnf-print-directory %S)" directory)
(ebnf-directory 'ebnf-print-buffer directory))
@@ -2287,8 +2287,8 @@
See also `ebnf-spool-buffer'."
(interactive
- (list (read-file-name "Directory containing EBNF files (spool): "
- nil default-directory)))
+ (list (read-directory-name "Directory containing EBNF files (spool): "
+ nil default-directory)))
(ebnf-log-header "(ebnf-spool-directory %S)" directory)
(ebnf-directory 'ebnf-spool-buffer directory))
@@ -2340,8 +2340,8 @@
See also `ebnf-eps-buffer'."
(interactive
- (list (read-file-name "Directory containing EBNF files (EPS): "
- nil default-directory)))
+ (list (read-directory-name "Directory containing EBNF files (EPS): "
+ nil default-directory)))
(ebnf-log-header "(ebnf-eps-directory %S)" directory)
(ebnf-directory 'ebnf-eps-buffer directory))
@@ -2425,8 +2425,8 @@
See also `ebnf-syntax-buffer'."
(interactive
- (list (read-file-name "Directory containing EBNF files (syntax): "
- nil default-directory)))
+ (list (read-directory-name "Directory containing EBNF files (syntax): "
+ nil default-directory)))
(ebnf-log-header "(ebnf-syntax-directory %S)" directory)
(ebnf-directory 'ebnf-syntax-buffer directory))
=== modified file 'lisp/shell.el'
--- a/lisp/shell.el 2011-02-17 05:02:02 +0000
+++ b/lisp/shell.el 2011-03-05 21:56:00 +0000
@@ -569,9 +569,9 @@
;; of the current-buffer rather than of the *shell* buffer.
(setq default-directory
(expand-file-name
- (read-file-name
+ (read-directory-name
"Default directory: " default-directory default-directory
- t nil 'file-directory-p))))))))
+ t nil))))))))
(require 'ansi-color)
(setq buffer (if (or buffer (not (derived-mode-p 'shell-mode))
(comint-check-proc (current-buffer)))
=== modified file 'lisp/speedbar.el'
--- a/lisp/speedbar.el 2011-02-17 05:13:17 +0000
+++ b/lisp/speedbar.el 2011-03-05 21:56:00 +0000
@@ -1622,7 +1622,7 @@
(let ((f (speedbar-line-file)))
(if f
(let* ((basedir (file-name-directory f))
- (nd (read-file-name "Create directory: "
+ (nd (read-directory-name "Create directory: "
basedir)))
;; Make the directory
(make-directory nd t)
=== modified file 'lisp/vc/emerge.el'
--- a/lisp/vc/emerge.el 2010-11-09 05:33:07 +0000
+++ b/lisp/vc/emerge.el 2011-03-05 21:56:00 +0000
@@ -1271,10 +1271,10 @@
(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"))
=== modified file 'lisp/vc/vc-dir.el'
--- a/lisp/vc/vc-dir.el 2011-03-03 07:33:35 +0000
+++ b/lisp/vc/vc-dir.el 2011-03-05 21:56:00 +0000
@@ -1185,9 +1185,9 @@
;; 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
=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el 2011-02-17 04:57:22 +0000
+++ b/lisp/vc/vc.el 2011-03-05 21:56:00 +0000
@@ -1954,7 +1954,7 @@
;; 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 @@
;; 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 ""))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103536: Replace many instances of read-file-name with read-directory-name.,
Chong Yidong <=