xref-find-by-kind 42088a1f87a: ; Revert accidental changes
Dmitry Gutov <[email protected]>
| Newsgroups | gmane.emacs.diffs |
|---|---|
| Message-ID | <[email protected]> |
branch: xref-find-by-kind commit 42088a1f87a56f4616c589566be425e026401d45 Author: Dmitry Gutov <[email protected]> Commit: Dmitry Gutov <[email protected]> ; Revert accidental changes --- lisp/progmodes/xref.el | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index c57fd1404b9..2e6037e742a 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -1697,7 +1697,7 @@ The meanings of both arguments are the same as documented in (not (memq command (cdr xref-prompt-for-identifier))) (memq command xref-prompt-for-identifier)))) -(defun xref-read-identifier (prompt &optional kind) +(defun xref-read-identifier (prompt) "Return the identifier at point or read it from the minibuffer. Reads and returns the identifier to use as input for the command being @@ -1725,11 +1725,7 @@ from `xref-backend-identifier-completion-table'." "[ :]+\\'" prompt)) def) prompt)) - (condition-case nil - (xref-backend-identifier-completion-table backend - kind) - (wrong-number-of-arguments - (xref-backend-identifier-completion-table backend))) + (xref-backend-identifier-completion-table backend) nil nil nil 'xref--read-identifier-history def t))) (if (equal id "") @@ -1848,8 +1844,7 @@ When called programmatically, KIND should be one of supported symbols." ;; probably only the elisp backend would have it. (xref-read-identifier (format-message (or (plist-get desc :prompt-format) "Find %s") - (plist-get desc :name)) - kind) + (plist-get desc :name))) kind))) (let ((kind-desc (cl-find-if (lambda (kind-desc) (eq (plist-get kind-desc :kind) kind))