From c54fb7b8c0f5c6ac27ce203cc249b5493b7938ef Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 14 Mar 2018 20:12:08 -0400 Subject: [PATCH] Fix package advice interfering with doom-initialize ...by aggressively reloading the config from within doom-initialize (too early, some state hasn't been initialized at this point). --- core/autoload/packages.el | 1 + core/core-packages.el | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/autoload/packages.el b/core/autoload/packages.el index 901a0bc8b..c9babd6f8 100644 --- a/core/autoload/packages.el +++ b/core/autoload/packages.el @@ -502,6 +502,7 @@ calls." ;;;###autoload (defun doom*package-delete (desc &rest _) "Update `quelpa-cache' upon a successful `package-delete'." + (doom-initialize-packages) (let ((name (package-desc-name desc))) (when (and (not (package-installed-p name)) (assq name quelpa-cache)) diff --git a/core/core-packages.el b/core/core-packages.el index 765a461bc..8151a85ce 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -845,13 +845,12 @@ compiled packages.'" ;; Make package.el cooperate with Doom ;; -(defun doom*initialize-packages (&rest _) - (unless doom-init-p (doom-initialize-packages))) +(defun doom*initialize-packages (&rest _) (package-initialize)) -(advice-add #'package-install :before #'doom*initialize-packages) -(advice-add #'package-reinstall :before #'doom*initialize-packages) (advice-add #'package-delete :before #'doom*initialize-packages) +(advice-add #'package-install :before #'doom*initialize-packages) (advice-add #'package-refresh-contents :before #'doom*initialize-packages) +(advice-add #'package-reinstall :before #'doom*initialize-packages) ;; Updates QUELPA after deleting a package (advice-add #'package-delete :after #'doom*package-delete)