From b8b51cee7b6d98bc6aa238a069193a1555d47d24 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 24 Feb 2021 18:28:23 -0500 Subject: [PATCH] Simplify after! The featurep check is redundant. eval-after-load does it too. --- core/core-lib.el | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/core/core-lib.el b/core/core-lib.el index 4b8aec482..688b46a4b 100644 --- a/core/core-lib.el +++ b/core/core-lib.el @@ -361,13 +361,10 @@ This is a wrapper around `eval-after-load' that: (require package nil 'noerror)) #'progn #'with-no-warnings) - (let ((body (macroexp-progn body))) - `(if (featurep ',package) - ,body - ;; We intentionally avoid `with-eval-after-load' to prevent - ;; eager macro expansion from pulling (or failing to pull) in - ;; autoloaded macros/packages. - (eval-after-load ',package ',body))))) + ;; We intentionally avoid `with-eval-after-load' to prevent eager + ;; macro expansion from pulling (or failing to pull) in autoloaded + ;; macros/packages. + `(eval-after-load ',package ',(macroexp-progn body)))) (let ((p (car package))) (cond ((not (keywordp p)) `(after! (:and ,@package) ,@body))