summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
2014-12-27 Dmitry Gutov <dgutov@yandex.ru>
+ * progmodes/elisp-mode.el (elisp--xref-identifier-file):
+ Skip features that have no sources.
+
* simple.el (execute-extended-command):
When `suggest-key-bindings' is nil, don't.
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."
(or (symbol-file sym 'defvar)
(help-C-file-name sym 'var))))
(`feature (when (featurep sym)
- (find-library-name (symbol-name sym))))
+ (ignore-errors
+ (find-library-name (symbol-name sym)))))
(`defface (when (facep sym)
(symbol-file sym 'defface)))))