From 3923760c7ccbca9aec7050117b91797c5ded8e77 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 2 Jan 2019 14:11:02 -0500 Subject: [PATCH] Adjust compile-time state in package helper macros --- core/core-packages.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index e42f9cc15..94908abc4 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -226,7 +226,9 @@ packages at once. Only use this macro in a module's packages.el file." (doom--assert-stage-p 'packages #'packages!) - `(progn ,@(cl-loop for desc in packages collect `(package! ,@(doom-enlist desc))))) + (macroexp-progn + (cl-loop for desc in packages + collect (macroexpand `(package! ,@(doom-enlist desc)))))) (defmacro disable-packages! (&rest packages) "A convenience macro like `package!', but allows you to disable multiple @@ -236,7 +238,7 @@ Only use this macro in a module's packages.el file." (doom--assert-stage-p 'packages #'disable-packages!) (macroexp-progn (cl-loop for pkg in packages - collect `(package! ,pkg :disable t)))) + collect (macroexpand `(package! ,pkg :disable t))))) (defmacro depends-on! (module submodule &optional flags) "Declares that this module depends on another.