aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/startup.el4
1 files changed, 1 insertions, 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."
1013 (when debug-on-error-should-be-set 1013 (when debug-on-error-should-be-set
1014 (setq debug-on-error debug-on-error-from-init-file)))) 1014 (setq debug-on-error debug-on-error-from-init-file))))
1015 1015
1016(defvar package--activated)
1017
1018(defun command-line () 1016(defun command-line ()
1019 "A subroutine of `normal-top-level'. 1017 "A subroutine of `normal-top-level'.
1020Amongst another things, it parses the command-line arguments." 1018Amongst another things, it parses the command-line arguments."
@@ -1235,7 +1233,7 @@ please check its value")
1235 ;; If any package directory exists, initialize the package system. 1233 ;; If any package directory exists, initialize the package system.
1236 (and user-init-file 1234 (and user-init-file
1237 package-enable-at-startup 1235 package-enable-at-startup
1238 (not package--activated) 1236 (not (bound-and-true-p package--activated))
1239 (catch 'package-dir-found 1237 (catch 'package-dir-found
1240 (let (dirs) 1238 (let (dirs)
1241 (if (boundp 'package-directory-list) 1239 (if (boundp 'package-directory-list)