From 7c229589833db0ef21128efd0672281279ba1823 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 11 Oct 2021 22:50:38 +0200 Subject: [PATCH 2/2] Use substitute-command-keys in format-prompt * lisp/minibuffer.el (format-prompt): Use substitute-command-keys. (Bug#51040) --- lisp/minibuffer.el | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 1e1a6f852e..694800de7c 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -4229,18 +4229,19 @@ format-prompt If DEFAULT is nil or an empty string, no \"default value\" string is included in the return value." - (concat - (if (null format-args) - prompt - (apply #'format prompt format-args)) - (and default - (or (not (stringp default)) - (length> default 0)) - (format minibuffer-default-prompt-format - (if (consp default) - (car default) - default))) - ": ")) + (substitute-command-keys + (concat + (if (null format-args) + prompt + (apply #'format prompt format-args)) + (and default + (or (not (stringp default)) + (length> default 0)) + (format minibuffer-default-prompt-format + (if (consp default) + (car default) + default))) + ": "))) (provide 'minibuffer) -- 2.30.2