summaryrefslogtreecommitdiff
path: root/lisp/progmodes/elisp-mode.el
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2015-11-24 00:11:51 +0200
committerDmitry Gutov <dgutov@yandex.ru>2015-11-24 00:12:13 +0200
commit58dfc16cd0befe0122ecc2c452e48135495519aa (patch)
tree12d2c609a5a1eba23a00e897e8241ebbe6402589 /lisp/progmodes/elisp-mode.el
parent345a9c8cd07111a8c8367e59404688544e8b8b1d (diff)
downloademacs-58dfc16cd0befe0122ecc2c452e48135495519aa.tar.gz
Don't use package-user-dir in elisp-library-roots if it's not bound
* lisp/progmodes/elisp-mode.el (elisp-library-roots): Don't use package-user-dir if it's not bound (bug#19759).
Diffstat (limited to 'lisp/progmodes/elisp-mode.el')
-rw-r--r--lisp/progmodes/elisp-mode.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 7e55c8e14bc..b0ef4b20b7a 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -832,8 +832,9 @@ non-nil result supercedes the xrefs produced by
(xref-elisp-location-file l))
(defun elisp-library-roots ()
- (defvar package-user-dir)
- (cons package-user-dir load-path))
+ (if (boundp 'package-user-dir)
+ (cons package-user-dir load-path)
+ load-path))
;;; Elisp Interaction mode