diff options
| -rw-r--r-- | lisp/emacs-lisp/package.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 6728f1b80b1..8d5fac96cfb 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -1445,13 +1445,13 @@ individual packages after calling `package-initialize' -- this is | |||
| 1445 | taken care of by `package-initialize'." | 1445 | taken care of by `package-initialize'." |
| 1446 | (interactive) | 1446 | (interactive) |
| 1447 | (setq package-alist nil) | 1447 | (setq package-alist nil) |
| 1448 | (if (equal user-init-file load-file-name) | 1448 | (if after-init-time |
| 1449 | ;; If `package-initialize' is being called as part of loading | 1449 | (package--ensure-init-file) |
| 1450 | ;; the init file, it's obvious we don't need to ensure-init. | 1450 | ;; If `package-initialize' is before we finished loading the init |
| 1451 | (setq package--init-file-ensured t | 1451 | ;; file, it's obvious we don't need to ensure-init. |
| 1452 | ;; And likely we don't need to run it again after init. | 1452 | (setq package--init-file-ensured t |
| 1453 | package-enable-at-startup nil) | 1453 | ;; And likely we don't need to run it again after init. |
| 1454 | (package--ensure-init-file)) | 1454 | package-enable-at-startup nil)) |
| 1455 | (package-load-all-descriptors) | 1455 | (package-load-all-descriptors) |
| 1456 | (package-read-all-archive-contents) | 1456 | (package-read-all-archive-contents) |
| 1457 | (unless no-activate | 1457 | (unless no-activate |