Make after! noop if package is disabled

After disabling a package, def-package! blocks for that package are
ignored. Now, after! blocks for those packages will be ignored too.
This commit is contained in:
Henrik Lissner 2018-05-20 15:51:47 +02:00
parent f2c02e32c8
commit 16a9126b3e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -108,6 +108,8 @@
"A smart wrapper around `with-eval-after-load'. Supresses warnings during "A smart wrapper around `with-eval-after-load'. Supresses warnings during
compilation." compilation."
(declare (indent defun) (debug t)) (declare (indent defun) (debug t))
(unless (and (symbolp targets)
(memq targets doom-disabled-packages))
(list (if (or (not (bound-and-true-p byte-compile-current-file)) (list (if (or (not (bound-and-true-p byte-compile-current-file))
(dolist (next (doom-enlist targets)) (dolist (next (doom-enlist targets))
(if (symbolp next) (if (symbolp next)
@ -128,7 +130,7 @@ compilation."
(setq body `(after! ,next ,@body))) (setq body `(after! ,next ,@body)))
body) body)
((listp targets) ((listp targets)
`(after! (:all ,@targets) ,@body))))) `(after! (:all ,@targets) ,@body))))))
(defmacro quiet! (&rest forms) (defmacro quiet! (&rest forms)
"Run FORMS without making any output." "Run FORMS without making any output."