From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 6 Jan 2021 02:26:03 +0000 (-0500)
Subject: * lisp/emacs-lisp/package.el (package-activate-all): Another tweak
X-Git-Tag: emacs-28.0.90~4359
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf672c66711c0aa24500cab99eb7f2ef63b02bf2;p=emacs.git

* 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.
---

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."
         ;; 2 when loading the .el file (this assumes we were careful to
         ;; save this file so it doesn't need any decoding).
         (let ((load-source-file-function nil))
+          (unless (boundp 'package-activated-list)
+            (setq package-activated-list nil))
           (load qs nil 'nomessage))
       (require 'package)
       (package--activate-all)))))