summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2020-07-22 17:49:40 -0700
committerSean Whitton <spwhitton@spwhitton.name>2020-07-22 18:04:03 -0700
commitf6cbd322cfd001c5e8214f7d632ac4b25c1d37a7 (patch)
treebbe8661e5adeb388529e07e398a84875685d8031
parent5a4e550051e438973b37019d009ca386e677c45d (diff)
downloademacs-f6cbd322cfd001c5e8214f7d632ac4b25c1d37a7.tar.gz
... but not too early
-rw-r--r--lisp/startup.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 4570f312b9a..850fdf4b5d7 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1233,6 +1233,9 @@ please check its value")
;; If any package directory exists, initialize the package system.
(and user-init-file
package-enable-at-startup
+ (require 'package)
+ (add-to-list 'package-directory-list
+ "/usr/share/emacs/site-lisp/elpa-src")
(not (bound-and-true-p package--activated))
(catch 'package-dir-found
(let (dirs)
@@ -1242,8 +1245,6 @@ please check its value")
(and (stringp f)
(equal (file-name-nondirectory f) "site-lisp")
(push (expand-file-name "elpa" f) dirs))))
- (add-to-list 'package-directory-list
- "/usr/share/emacs/site-lisp/elpa-src")
(push (if (boundp 'package-user-dir)
package-user-dir
(locate-user-emacs-file "elpa"))