diff options
| author | Stefan Monnier | 2021-01-05 21:26:03 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2021-01-05 21:26:03 -0500 |
| commit | cf672c66711c0aa24500cab99eb7f2ef63b02bf2 (patch) | |
| tree | 36f33ad8d35b66cde5fc76fe4929a989c86957fd | |
| parent | 7d7bfbf0346114b116e14a4338ea235d12674f13 (diff) | |
| download | emacs-cf672c66711c0aa24500cab99eb7f2ef63b02bf2.tar.gz emacs-cf672c66711c0aa24500cab99eb7f2ef63b02bf2.zip | |
* lisp/emacs-lisp/package.el (package-activate-all): Another tweak
`package-quickstart.el` files presume `package-activated-list`
is a bound variable, so make sure this is the case even when `package.el` is
not yet loaded.
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index a38363df23e..453e86c7831 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -1640,6 +1640,8 @@ The variable `package-load-list' controls which packages to load." | |||
| 1640 | ;; 2 when loading the .el file (this assumes we were careful to | 1640 | ;; 2 when loading the .el file (this assumes we were careful to |
| 1641 | ;; save this file so it doesn't need any decoding). | 1641 | ;; save this file so it doesn't need any decoding). |
| 1642 | (let ((load-source-file-function nil)) | 1642 | (let ((load-source-file-function nil)) |
| 1643 | (unless (boundp 'package-activated-list) | ||
| 1644 | (setq package-activated-list nil)) | ||
| 1643 | (load qs nil 'nomessage)) | 1645 | (load qs nil 'nomessage)) |
| 1644 | (require 'package) | 1646 | (require 'package) |
| 1645 | (package--activate-all))))) | 1647 | (package--activate-all))))) |