Commit 96828581 authored by Stefan Monnier's avatar Stefan Monnier

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

parent 6b4a97c1
Pipeline #4011 failed with stage
in 59 minutes and 29 seconds
...@@ -1013,8 +1013,6 @@ the `--debug-init' option to view a complete error backtrace." ...@@ -1013,8 +1013,6 @@ the `--debug-init' option to view a complete error backtrace."
(when debug-on-error-should-be-set (when debug-on-error-should-be-set
(setq debug-on-error debug-on-error-from-init-file)))) (setq debug-on-error debug-on-error-from-init-file))))
(defvar package--activated)
(defun command-line () (defun command-line ()
"A subroutine of `normal-top-level'. "A subroutine of `normal-top-level'.
Amongst another things, it parses the command-line arguments." Amongst another things, it parses the command-line arguments."
...@@ -1235,7 +1233,7 @@ please check its value") ...@@ -1235,7 +1233,7 @@ please check its value")
;; If any package directory exists, initialize the package system. ;; If any package directory exists, initialize the package system.
(and user-init-file (and user-init-file
package-enable-at-startup package-enable-at-startup
(not package--activated) (not (bound-and-true-p package--activated))
(catch 'package-dir-found (catch 'package-dir-found
(let (dirs) (let (dirs)
(if (boundp 'package-directory-list) (if (boundp 'package-directory-list)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment