summaryrefslogtreecommitdiff
path: root/lisp/frame.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-09-06 20:35:11 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-09-06 20:35:11 +0200
commit660d13bd7b47c1b7db990adcc671b55b6f1f83f2 (patch)
treeb470b0f2fcba1f428556eb2cebe4988ccf4e294e /lisp/frame.el
parent3444f397c7d20ca59f7b18f6fe95aa79b33727e5 (diff)
downloademacs-660d13bd7b47c1b7db990adcc671b55b6f1f83f2.tar.gz
Use format-prompt in calls to completing-read with a default value
* lisp/textmodes/rst.el (rst-insert-list-new-item): * lisp/tab-bar.el (tab-bar-switch-to-tab): * lisp/profiler.el (profiler-start): * lisp/frame.el (set-frame-font): * lisp/erc/erc.el (erc-join-channel): * lisp/emacs-lock.el (emacs-lock--set-mode): * lisp/emacs-lisp/elp.el (elp-set-master): * lisp/emacs-lisp/checkdoc.el () (checkdoc-this-string-valid-engine): * lisp/calendar/todo-mode.el (todo-find-filtered-items-file): * lisp/calendar/calendar.el (calendar-set-date-style): Use `format-prompt' in calls to completing-read that has a default value, but didn't mention that in the prompt.
Diffstat (limited to 'lisp/frame.el')
-rw-r--r--lisp/frame.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 70088545a68..05da1ea7b8b 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1412,12 +1412,12 @@ as though the font-related attributes of the `default' face had been
\"set in this session\", so that the font is applied to future frames."
(interactive
(let* ((completion-ignore-case t)
- (font (completing-read "Font name: "
+ (default (frame-parameter nil 'font))
+ (font (completing-read (format-prompt "Font name" default)
;; x-list-fonts will fail with an error
;; if this frame doesn't support fonts.
(x-list-fonts "*" nil (selected-frame))
- nil nil nil nil
- (frame-parameter nil 'font))))
+ nil nil nil nil default)))
(list font current-prefix-arg nil)))
(when (or (stringp font) (fontp font))
(let* ((this-frame (selected-frame))