summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/abbrev.el4
-rw-r--r--lisp/bookmark.el6
-rw-r--r--lisp/dired.el5
-rw-r--r--lisp/files.el24
-rw-r--r--lisp/gnus/gnus-bookmark.el3
-rw-r--r--lisp/help-fns.el10
-rw-r--r--lisp/mail/rmailmm.el2
-rw-r--r--lisp/misearch.el7
-rw-r--r--lisp/progmodes/etags.el4
-rw-r--r--lisp/vc/diff-mode.el7
-rw-r--r--lisp/vc/ediff-ptch.el12
-rw-r--r--lisp/vc/vc.el18
-rw-r--r--lisp/xwidget.el17
13 files changed, 61 insertions, 58 deletions
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index be6f9ee3437..50d0011e812 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -233,7 +233,7 @@ If VERBOSE is non-nil, display a message indicating where abbrevs
have been saved."
(interactive
(list
- (read-file-name "Write abbrev file: "
+ (read-file-name (format-prompt "Write abbrev file" abbrev-file-name)
(file-name-directory (expand-file-name abbrev-file-name))
abbrev-file-name)))
(or (and file (> (length file) 0))
@@ -262,7 +262,7 @@ have been saved."
(defun abbrev-edit-save-to-file (file)
"Save all user-level abbrev definitions in current buffer to FILE."
(interactive
- (list (read-file-name "Save abbrevs to file: "
+ (list (read-file-name (format-prompt "Save abbrevs to file" abbrev-file-name)
(file-name-directory
(expand-file-name abbrev-file-name))
abbrev-file-name)))
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index dcb03adadd8..206c87223c2 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1425,8 +1425,8 @@ for a file, defaulting to the file defined by variable
bookmark-default-file)))
(if parg
;; This should be part of the `interactive' spec.
- (read-file-name (format "File to save bookmarks in: (%s) "
- default)
+ (read-file-name (format-prompt "File to save bookmarks in"
+ default)
(file-name-directory default) default)
default))))
(bookmark-write-file file)
@@ -1538,7 +1538,7 @@ unique numeric suffixes \"<2>\", \"<3>\", etc."
(or (car bookmark-bookmarks-timestamp)
(expand-file-name bookmark-default-file))))
(prefix current-prefix-arg))
- (list (read-file-name (format "Load bookmarks from: (%s) " default)
+ (list (read-file-name (format-prompt "Load bookmarks from" default)
(file-name-directory default) default 'confirm)
prefix nil prefix)))
(let* ((file (expand-file-name file))
diff --git a/lisp/dired.el b/lisp/dired.el
index e4bc4decf84..733d83e5802 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -896,8 +896,9 @@ ERROR can be a string with the error message."
(if (next-read-file-uses-dialog-p)
(read-directory-name (format "Dired %s(directory): " str)
nil default-directory nil)
- (read-file-name (format "Dired %s(directory): " str)
- nil default-directory nil)))))
+ (read-file-name (format-prompt "Dired %s(directory)"
+ default-directory str)
+ nil default-directory)))))
;; We want to switch to a more sophisticated version of
;; dired-read-dir-and-switches like the following, if there is a way
diff --git a/lisp/files.el b/lisp/files.el
index e6629d2a21a..71951dd349e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4527,13 +4527,12 @@ Interactively, confirmation is required unless you supply a prefix argument."
;; (interactive "FWrite file: ")
(interactive
(list (if buffer-file-name
- (read-file-name "Write file: "
- nil nil nil nil)
- (read-file-name "Write file: " default-directory
- (expand-file-name
- (file-name-nondirectory (buffer-name))
- default-directory)
- nil nil))
+ (read-file-name "Write file: ")
+ (read-file-name
+ (format-prompt "Write file" (file-name-nondirectory (buffer-name)))
+ default-directory
+ (expand-file-name (file-name-nondirectory (buffer-name))
+ default-directory)))
(not current-prefix-arg)))
(or (null filename) (string-equal filename "")
(progn
@@ -5271,10 +5270,13 @@ Before and after saving the buffer, this function runs
(unless (run-hook-with-args-until-success 'write-contents-functions)
;; If buffer has no file name, ask user for one.
(or buffer-file-name
- (let ((filename
- (expand-file-name
- (read-file-name "File to save in: "
- nil (expand-file-name (buffer-name))))))
+ (let* ((default (expand-file-name (buffer-name)))
+ (filename
+ (expand-file-name
+ (read-file-name
+ (format-prompt "File to save in"
+ (file-name-nondirectory default))
+ nil default))))
(if (file-exists-p filename)
(if (file-directory-p filename)
;; Signal an error if the user specified the name of an
diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index 1b00bbbc69c..7e9684394ac 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -315,8 +315,7 @@ affect point."
"Load Gnus bookmarks from FILE (which must be in bookmark format)."
(interactive
(list (read-file-name
- (format "Load Gnus bookmarks from: (%s) "
- gnus-bookmark-default-file)
+ (format-prompt "Load Gnus bookmarks from" gnus-bookmark-default-file)
"~/" gnus-bookmark-default-file 'confirm)))
(setq file (expand-file-name file))
(if (file-readable-p file)
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index a9943ccd7f4..0e20d0f3538 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1813,8 +1813,9 @@ one of them returns non-nil."
;;;###autoload
(defun doc-file-to-man (file)
"Produce an nroff buffer containing the doc-strings from the DOC file."
- (interactive (list (read-file-name "Name of DOC file: " doc-directory
- internal-doc-file-name t)))
+ (interactive (list (read-file-name (format-prompt "Name of DOC file"
+ internal-doc-file-name)
+ doc-directory internal-doc-file-name t)))
(or (file-readable-p file)
(error "Cannot read file `%s'" file))
(pop-to-buffer (generate-new-buffer "*man-doc*"))
@@ -1843,8 +1844,9 @@ one of them returns non-nil."
;;;###autoload
(defun doc-file-to-info (file)
"Produce a texinfo buffer with sorted doc-strings from the DOC file."
- (interactive (list (read-file-name "Name of DOC file: " doc-directory
- internal-doc-file-name t)))
+ (interactive (list (read-file-name (format-prompt "Name of DOC file"
+ internal-doc-file-name)
+ doc-directory internal-doc-file-name t)))
(or (file-readable-p file)
(error "Cannot read file `%s'" file))
(let ((i 0) type name doc alist)
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 29c6dcf40e8..0b9af8292b3 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -269,7 +269,7 @@ TRUNCATED is non-nil if the text of this entity was truncated."
(unless (y-or-n-p "This entity is truncated; save anyway? ")
(error "Aborted")))
(setq filename (expand-file-name
- (read-file-name (format "Save as (default: %s): " filename)
+ (read-file-name (format-prompt "Save as" filename)
directory
(expand-file-name filename directory))
directory))
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 958c10a1bf6..7796df49c4e 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -316,9 +316,10 @@ Every next/previous file in the defined sequence is visited by
(defun multi-isearch-read-files ()
"Return a list of files specified interactively, one by one."
;; Most code from `multi-occur'.
- (let* ((files (list (read-file-name "First file to search: "
- default-directory
- buffer-file-name)))
+ (let* ((files (list (read-file-name
+ (format-prompt "First file to search: "
+ (file-name-nondirectory buffer-file-name))
+ default-directory buffer-file-name)))
(file nil))
(while (not (string-equal
(setq file (read-file-name
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 2c5c36504a9..81cb2b7cd77 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -292,7 +292,7 @@ file the tag was in."
(or (locate-dominating-file default-directory "TAGS")
default-directory)))
(list (read-file-name
- "Visit tags table (default TAGS): "
+ (format-prompt "Visit tags table" "TAGS")
;; default to TAGS from default-directory up to root.
default-tag-dir
(expand-file-name "TAGS" default-tag-dir)
@@ -625,7 +625,7 @@ Returns t if it visits a tags table, or nil if there are no more in the list."
(car list))
;; Finally, prompt the user for a file name.
(expand-file-name
- (read-file-name "Visit tags table (default TAGS): "
+ (read-file-name (format-prompt "Visit tags table" "TAGS")
default-directory
"TAGS"
t))))))
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 9c41d508b6b..a1fdd11ca04 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -911,10 +911,11 @@ like \(diff-merge-strings \"b/foo\" \"b/bar\" \"/a/c/foo\")."
If the OLD prefix arg is passed, tell the file NAME of the old file."
(interactive
(let* ((old current-prefix-arg)
- (fs (diff-hunk-file-names current-prefix-arg)))
+ (fs (diff-hunk-file-names current-prefix-arg))
+ (default (diff-find-file-name old 'noprompt)))
(unless fs (error "No file name to look for"))
- (list old (read-file-name (format "File for %s: " (car fs))
- nil (diff-find-file-name old 'noprompt) t))))
+ (list old (read-file-name (format-prompt "File for %s" default (car fs))
+ nil default t))))
(let ((fs (diff-hunk-file-names old)))
(unless fs (error "No file name to look for"))
(push (cons fs name) diff-remembered-files-alist)))
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index f6af5a45550..8b122093c15 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -499,15 +499,11 @@ are two possible targets for this %spatch. However, these files do not exist."
patch-file-name)
(setq patch-file-name
(read-file-name
- (format "Patch is in file%s: "
- (cond ((and buffer-file-name
+ (format-prompt "Patch is in file"
+ (and buffer-file-name
(equal (expand-file-name dir)
- (file-name-directory buffer-file-name)))
- (concat
- " (default "
- (file-name-nondirectory buffer-file-name)
- ")"))
- (t "")))
+ (file-name-directory buffer-file-name))
+ (file-name-nondirectory buffer-file-name)))
dir buffer-file-name 'must-match))
(if (file-directory-p patch-file-name)
(error "Patch file cannot be a directory: %s" patch-file-name)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 4cbd2658f80..983fb598f70 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -953,10 +953,9 @@ use."
;; repository, make sure it's a parent of
;; file.
(read-file-name
- (format "create %s repository in: " bk)
+ (format-prompt "create %s repository in" def-dir bk)
default-directory def-dir t nil
(lambda (arg)
- (message "arg %s" arg)
(and (file-directory-p arg)
(string-prefix-p (expand-file-name arg) def-dir)))))))
(let ((default-directory repo-dir))
@@ -2900,10 +2899,10 @@ backend to NEW-BACKEND, and unregister FILE from the current backend.
"Delete file and mark it as such in the version control system.
If called interactively, read FILE, defaulting to the current
buffer's file name if it's under version control."
- (interactive (list (read-file-name "VC delete file: " nil
- (when (vc-backend buffer-file-name)
- buffer-file-name)
- t)))
+ (interactive (list (let ((default (when (vc-backend buffer-file-name)
+ buffer-file-name)))
+ (read-file-name "VC delete file" default)
+ nil default t)))
(setq file (expand-file-name file))
(let ((buf (get-file-buffer file))
(backend (vc-backend file)))
@@ -2944,9 +2943,10 @@ buffer's file name if it's under version control."
"Rename file OLD to NEW in both work area and repository.
If called interactively, read OLD and NEW, defaulting OLD to the
current buffer's file name if it's under version control."
- (interactive (list (read-file-name "VC rename file: " nil
- (when (vc-backend buffer-file-name)
- buffer-file-name) t)
+ (interactive (list (let ((default (when (vc-backend buffer-file-name)
+ buffer-file-name)))
+ (read-file-name (format-prompt "VC rename file" default)
+ nil default t))
(read-file-name "Rename to: ")))
;; in CL I would have said (setq new (merge-pathnames new old))
(let ((old-base (file-name-nondirectory old)))
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 074320855c5..d6ca300f3aa 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -326,14 +326,15 @@ If non-nil, plugins are enabled. Otherwise, disabled."))
FILE-NAME combined with `xwidget-webkit-download-dir' is the default file name
of the prompt when reading. When the file name the user specified is a
directory, URL is saved at the specified directory as FILE-NAME."
- (let ((save-name (read-file-name
- (format "Save URL `%s' of type `%s' in file/directory: "
- url mime-type)
- xwidget-webkit-download-dir
- (when file-name
- (expand-file-name
- file-name
- xwidget-webkit-download-dir)))))
+ (let* ((default (when file-name
+ (expand-file-name
+ file-name
+ xwidget-webkit-download-dir)))
+ (save-name
+ (read-file-name
+ (format-prompt "Save URL `%s' of type `%s' in file/directory"
+ default url mime-type)
+ xwidget-webkit-download-dir default)))
(if (file-directory-p save-name)
(setq save-name
(expand-file-name (file-name-nondirectory file-name) save-name)))
View Lorry Controller Status