master fbe0d7361f: package-activate-all: Use the quickstart more conservatively

[Stefan Monnier]

branch: master
commit fbe0d7361f046e28f021cdce0adf05dfda93fe45
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    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.
---
 lisp/emacs-lisp/package.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 9243869853..f4872a1a52 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -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).