summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/elp.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-09-10 10:45:02 +0200
committerAndrea Corallo <akrl@sdf.org>2020-09-10 10:45:02 +0200
commita26b14733bba6659548f00db634bc45ccd222447 (patch)
tree4b0e1d39334c03a90ce718a3e051be60ca28822b /lisp/emacs-lisp/elp.el
parent107514a6e21f2c434cdae0eca76fe0a60e287ac8 (diff)
parent931b9f5953013c1e8844d0c723411b87ccfedb1a (diff)
downloademacs-a26b14733bba6659548f00db634bc45ccd222447.tar.gz
emacs-a26b14733bba6659548f00db634bc45ccd222447.tar.bz2
emacs-a26b14733bba6659548f00db634bc45ccd222447.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/elp.el')
-rw-r--r--lisp/emacs-lisp/elp.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index f68c0faf09d..a94978ac47b 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -342,9 +342,9 @@ Use optional LIST if provided instead."
(interactive
(list
(intern
- (completing-read "Master function: " obarray
- #'elp--instrumented-p
- t nil nil (if elp-master (symbol-name elp-master))))))
+ (let ((default (if elp-master (symbol-name elp-master))))
+ (completing-read (format-prompt "Master function" default)
+ obarray #'elp--instrumented-p t nil nil default)))))
;; When there's a master function, recording is turned off by default.
(setq elp-master funsym
elp-record-p nil)