diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-09-07 22:10:01 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-09-07 22:10:06 +0200 |
| commit | de4f347901adffd07bc9bff028dc073fb3c6df33 (patch) | |
| tree | a7b6653904dde6260d8708e94877a9a4e6e9b3c1 /lisp/files.el | |
| parent | 151486931c82f6af38a912631c9cd41b677aae47 (diff) | |
| download | emacs-de4f347901adffd07bc9bff028dc073fb3c6df33.tar.gz emacs-de4f347901adffd07bc9bff028dc073fb3c6df33.tar.bz2 emacs-de4f347901adffd07bc9bff028dc073fb3c6df33.zip | |
Use format-prompt in read-file-name calls that have a default
* lisp/xwidget.el (xwidget-webkit-save-as-file):
* lisp/vc/vc.el (vc-backend-for-registration, vc-delete-file)
(vc-rename-file):
* lisp/vc/ediff-ptch.el (ediff-prompt-for-patch-file):
* lisp/vc/diff-mode.el (diff-tell-file-name):
* lisp/progmodes/etags.el (visit-tags-table)
(visit-tags-table-buffer):
* lisp/misearch.el (multi-isearch-read-files):
* lisp/mail/rmailmm.el (rmail-mime-save):
* lisp/help-fns.el (doc-file-to-man, doc-file-to-info):
* lisp/gnus/gnus-bookmark.el (gnus-bookmark-load):
* lisp/files.el (write-file, basic-save-buffer):
* lisp/dired.el (dired-read-dir-and-switches):
* lisp/bookmark.el (bookmark-save, bookmark-load):
* lisp/abbrev.el (write-abbrev-file, abbrev-edit-save-to-file):
Use format-prompt in read-file-name calls that have a default.
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 24 |
1 files changed, 13 insertions, 11 deletions
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 |