mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 09:51:22 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'savannah/master' into HEAD

Browse source
This commit is contained in:
Andrea Corallo 2020-09-10 10:45:02 +02:00
commit a26b14733b
160 changed files with 2218 additions and 1175 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/emacs-lisp/find-func.el
View file

@ -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)