From 58dfc16cd0befe0122ecc2c452e48135495519aa Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Tue, 24 Nov 2015 00:11:51 +0200 Subject: [PATCH] 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 file 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 -- 2.39.2