aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2014-12-28 01:54:43 +0200
committerDmitry Gutov2014-12-28 01:54:43 +0200
commit968d096203fd900c8497ed455cd2682f9875448f (patch)
tree533117106e072c4645c5c19e6b98e060fcd46ce1
parentee01a8c05b646c6adcce6c5d6c7ab1ce5494ed99 (diff)
downloademacs-968d096203fd900c8497ed455cd2682f9875448f.tar.gz
emacs-968d096203fd900c8497ed455cd2682f9875448f.zip
(elisp--xref-identifier-file): Skip features that have no sources
* lisp/progmodes/elisp-mode.el (elisp--xref-identifier-file): Skip features that have no sources.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/elisp-mode.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c5a9c4a3cd..7678116f576 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-12-27 Dmitry Gutov <dgutov@yandex.ru> 12014-12-27 Dmitry Gutov <dgutov@yandex.ru>
2 2
3 * progmodes/elisp-mode.el (elisp--xref-identifier-file):
4 Skip features that have no sources.
5
3 * simple.el (execute-extended-command): 6 * simple.el (execute-extended-command):
4 When `suggest-key-bindings' is nil, don't. 7 When `suggest-key-bindings' is nil, don't.
5 8
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 347560a484e..ac216d99cce 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -578,7 +578,8 @@ It can be quoted, or be inside a quoted form."
578 (or (symbol-file sym 'defvar) 578 (or (symbol-file sym 'defvar)
579 (help-C-file-name sym 'var)))) 579 (help-C-file-name sym 'var))))
580 (`feature (when (featurep sym) 580 (`feature (when (featurep sym)
581 (find-library-name (symbol-name sym)))) 581 (ignore-errors
582 (find-library-name (symbol-name sym)))))
582 (`defface (when (facep sym) 583 (`defface (when (facep sym)
583 (symbol-file sym 'defface))))) 584 (symbol-file sym 'defface)))))
584 585