From f3e85afc7e33f243a970d6eebf570d22af95cf44 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 8 Sep 2022 13:16:59 +0200 Subject: [PATCH] fix(lib): ensure after! body gets expanded Relying on eval-after-load's compiler-macro magic (after 8b4f722) can cause scope issues with nested macros (like file! and dir! running in the context of a temp buffer), so best we use with-eval-after-load directly. Ref: 8b4f722fa343 --- lisp/doom-lib.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/doom-lib.el b/lisp/doom-lib.el index 4975e9b11..377377465 100644 --- a/lisp/doom-lib.el +++ b/lisp/doom-lib.el @@ -586,7 +586,7 @@ things you want byte-compiled in them! Like function/macro definitions." (require package nil 'noerror)) #'progn #'with-no-warnings) - `(eval-after-load ',package ',(macroexp-progn body)))) + `(with-eval-after-load ',package ,@body))) (let ((p (car package))) (cond ((memq p '(:or :any)) (macroexp-progn