From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 11 Nov 2019 22:14:30 +0000 (-0500)
Subject: * lisp/startup.el (command-line): Fix last change in package--activated
X-Git-Tag: emacs-27.0.90~657
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=96828581d9efdcff4ac0c11d0f638d99d3a191bf;p=emacs.git

* lisp/startup.el (command-line): Fix last change in package--activated
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 5fd76d9284e..efd1ae9a4fc 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1013,8 +1013,6 @@ the `--debug-init' option to view a complete error backtrace."
     (when debug-on-error-should-be-set
       (setq debug-on-error debug-on-error-from-init-file))))
 
-(defvar package--activated)
-
 (defun command-line ()
   "A subroutine of `normal-top-level'.
 Amongst another things, it parses the command-line arguments."
@@ -1235,7 +1233,7 @@ please check its value")
   ;; If any package directory exists, initialize the package system.
   (and user-init-file
        package-enable-at-startup
-       (not package--activated)
+       (not (bound-and-true-p package--activated))
        (catch 'package-dir-found
 	 (let (dirs)
 	   (if (boundp 'package-directory-list)