diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-09-10 10:45:02 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-09-10 10:45:02 +0200 |
| commit | a26b14733bba6659548f00db634bc45ccd222447 (patch) | |
| tree | 4b0e1d39334c03a90ce718a3e051be60ca28822b /lisp/emacs-lisp/find-func.el | |
| parent | 107514a6e21f2c434cdae0eca76fe0a60e287ac8 (diff) | |
| parent | 931b9f5953013c1e8844d0c723411b87ccfedb1a (diff) | |
| download | emacs-a26b14733bba6659548f00db634bc45ccd222447.tar.gz emacs-a26b14733bba6659548f00db634bc45ccd222447.tar.bz2 emacs-a26b14733bba6659548f00db634bc45ccd222447.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/find-func.el')
| -rw-r--r-- | lisp/emacs-lisp/find-func.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index 60b16257a3e..9802bd4ca9b 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -319,9 +319,7 @@ if non-nil)." (thing-at-point 'symbol)))) (when (and def (not (test-completion def table))) (setq def nil)) - (completing-read (if def - (format "Library name (default %s): " def) - "Library name: ") + (completing-read (format-prompt "Library name" def) table nil nil nil nil def))) ;;;###autoload @@ -489,12 +487,10 @@ otherwise uses `variable-at-point'." (prompt-type (cdr (assq type '((nil . "function") (defvar . "variable") (defface . "face"))))) - (prompt (concat "Find " prompt-type - (and symb (format " (default %s)" symb)) - ": ")) (enable-recursive-minibuffers t)) (list (intern (completing-read - prompt obarray predicate + (format-prompt "Find %s" symb prompt-type) + obarray predicate t nil nil (and symb (symbol-name symb))))))) (defun find-function-do-it (symbol type switch-fn) |