[Emacs-diffs] emacs-25 58dfc16: Don't use package-user-dir in elisp-library-roots if it's not bound

[Dmitry Gutov]

branch: emacs-25
commit 58dfc16cd0befe0122ecc2c452e48135495519aa
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    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).
---
 lisp/progmodes/elisp-mode.el |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 7e55c8e..b0ef4b2 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