emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix package advice interfering with doom-initialize

Browse source 
...by aggressively reloading the config from within doom-initialize (too
early, some state hasn't been initialized at this point).
This commit is contained in:
Henrik Lissner 2018-03-14 20:12:08 -04:00
parent 8898c5cb9a
commit c54fb7b8c0
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/autoload/packages.el
View file

@ -502,6 +502,7 @@ calls."
;;;###autoload ;;;###autoload
(defun doom*package-delete (desc &rest _) (defun doom*package-delete (desc &rest _)
"Update `quelpa-cache' upon a successful `package-delete'." "Update `quelpa-cache' upon a successful `package-delete'."
(doom-initialize-packages)
(let ((name (package-desc-name desc))) (let ((name (package-desc-name desc)))
(when (and (not (package-installed-p name)) (when (and (not (package-installed-p name))
(assq name quelpa-cache)) (assq name quelpa-cache))

7
core/core-packages.el
View file

@ -845,13 +845,12 @@ compiled packages.'"
;; Make package.el cooperate with Doom ;; Make package.el cooperate with Doom
;; ;;
(defun doom*initialize-packages (&rest _) (defun doom*initialize-packages (&rest _) (package-initialize))
(unless doom-init-p (doom-initialize-packages)))
(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-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-refresh-contents :before #'doom*initialize-packages)
(advice-add #'package-reinstall :before #'doom*initialize-packages)
;; Updates QUELPA after deleting a package ;; Updates QUELPA after deleting a package
(advice-add #'package-delete :after #'doom*package-delete) (advice-add #'package-delete :after #'doom*package-delete)