From: Dmitry Gutov <dgutov@yandex.ru>
Date: Fri, 17 Apr 2015 23:35:59 +0000 (+0300)
Subject: Don't show both feature and function with the same name
X-Git-Tag: emacs-25.0.90~2382
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ec1047b57ccea0f62a2de8095d1bbc07bd43576;p=emacs.git

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.
---

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."
                          (not (fboundp sym))
                          (or (symbol-file sym 'defvar)
                              (help-C-file-name sym 'var))))
-           (`feature (when (featurep sym)
-                       (ignore-errors
-                         (find-library-name (symbol-name sym)))))
+           (`feature (and (featurep sym)
+                          ;; Skip when a function with the same name
+                          ;; is defined, because it's probably in the
+                          ;; same file.
+                          (not (fboundp sym))
+                          (ignore-errors
+                            (find-library-name (symbol-name sym)))))
            (`defface (when (facep sym)
                        (symbol-file sym 'defface))))))
     (when file