From 96828581d9efdcff4ac0c11d0f638d99d3a191bf Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 11 Nov 2019 17:14:30 -0500
Subject: [PATCH] * lisp/startup.el (command-line): Fix last change in
package--activated
---
lisp/startup.el | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
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)
--
2.39.5