summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 30f1a253ee6..651224fe6c4 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1013,6 +1013,8 @@ 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 nil)
+
(defun command-line ()
"A subroutine of `normal-top-level'.
Amongst another things, it parses the command-line arguments."
@@ -1233,6 +1235,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)
(catch 'package-dir-found
(let (dirs)
(if (boundp 'package-directory-list)