diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-08-05 11:48:47 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-08-05 16:20:52 -0700 |
| commit | ff39145fd52d457844ecddffd032a01c71aa1eee (patch) | |
| tree | c6f6de84bf5c5fe9ca6e2170cd48c5f9f0b04207 | |
| parent | 507684dafcd773b46d473f715251f37206f0e57d (diff) | |
| download | emacs-ff39145fd52d457844ecddffd032a01c71aa1eee.tar.gz | |
move addition to package-directory-list
This should mean it gets into the list even in batch mode.
| -rw-r--r-- | lisp/emacs-lisp/package.el | 1 | ||||
| -rw-r--r-- | lisp/startup.el | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index e6f54d206d8..aa9d88e0ff1 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -305,6 +305,7 @@ packages in `package-directory-list'." (and (stringp f) (equal (file-name-nondirectory f) "site-lisp") (push (expand-file-name "elpa" f) result))) + (push "/usr/share/emacs-snapshot/site-lisp/elpa" result) (nreverse result)) "List of additional directories containing Emacs Lisp packages. Each directory name should be absolute. diff --git a/lisp/startup.el b/lisp/startup.el index d679a96e779..238718670bd 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1233,9 +1233,6 @@ 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-snapshot/site-lisp/elpa") (not (bound-and-true-p package--activated)) (catch 'package-dir-found (let (dirs) @@ -1244,7 +1241,8 @@ please check its value") (dolist (f load-path) (and (stringp f) (equal (file-name-nondirectory f) "site-lisp") - (push (expand-file-name "elpa" f) dirs)))) + (push (expand-file-name "elpa" f) dirs))) + (push "/usr/share/emacs-snapshot/site-lisp/elpa" dirs)) (push (if (boundp 'package-user-dir) package-user-dir (locate-user-emacs-file "elpa")) |