package-activate-all: Use the quickstart more conservatively
* lisp/emacs-lisp/package.el (package-activate-all): Don't use the quickstart file if some packages have already been activated.
This commit is contained in:
@@ -1629,7 +1629,9 @@ The variable `package-load-list' controls which packages to load."
|
||||
(qs (if (file-readable-p elc) elc
|
||||
(if (file-readable-p package-quickstart-file)
|
||||
package-quickstart-file))))
|
||||
(if qs
|
||||
;; The quickstart file presumes that it has a blank slate,
|
||||
;; so don't use it if we already activated some packages.
|
||||
(if (and qs (not (bound-and-true-p package-activated-list)))
|
||||
;; Skip load-source-file-function which would slow us down by a factor
|
||||
;; 2 when loading the .el file (this assumes we were careful to
|
||||
;; save this file so it doesn't need any decoding).
|
||||
|
||||
Reference in New Issue
Block a user