aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2015-04-18 02:35:59 +0300
committerDmitry Gutov2015-04-18 02:35:59 +0300
commit3ec1047b57ccea0f62a2de8095d1bbc07bd43576 (patch)
treef7d3af037a433bcd7bbf065adf5af5ef9c0dfe00
parent35be45bbc9ac525bb2bc3e20b0fa27c1ceee0c15 (diff)
downloademacs-3ec1047b57ccea0f62a2de8095d1bbc07bd43576.tar.gz
emacs-3ec1047b57ccea0f62a2de8095d1bbc07bd43576.zip
Don't show both feature and function with the same name
* lisp/progmodes/elisp-mode.el (elisp--xref-identifier-location): Don't show both feature and function with the same name.
-rw-r--r--lisp/progmodes/elisp-mode.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index ff427fd51da..ad35c48a101 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -606,9 +606,13 @@ It can be quoted, or be inside a quoted form."
606 (not (fboundp sym)) 606 (not (fboundp sym))
607 (or (symbol-file sym 'defvar) 607 (or (symbol-file sym 'defvar)
608 (help-C-file-name sym 'var)))) 608 (help-C-file-name sym 'var))))
609 (`feature (when (featurep sym) 609 (`feature (and (featurep sym)
610 (ignore-errors 610 ;; Skip when a function with the same name
611 (find-library-name (symbol-name sym))))) 611 ;; is defined, because it's probably in the
612 ;; same file.
613 (not (fboundp sym))
614 (ignore-errors
615 (find-library-name (symbol-name sym)))))
612 (`defface (when (facep sym) 616 (`defface (when (facep sym)
613 (symbol-file sym 'defface)))))) 617 (symbol-file sym 'defface))))))
614 (when file 618 (when file