From f7a86ae281a0a59c3e14231009ca98ffad53b483 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 12 Jun 2018 00:26:28 +0200 Subject: [PATCH] Refactor def-package! It is no longer necessary to gate use-package calls with :if/:when/:unless checks during byte-compilation. This was fixed somewhere along the way. --- core/core-modules.el | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/core/core-modules.el b/core/core-modules.el index 0d67b3e23..5e16a4fd0 100644 --- a/core/core-modules.el +++ b/core/core-modules.el @@ -265,13 +265,7 @@ to least)." (when (and (memq name (bound-and-true-p doom-disabled-packages)) (not (memq :disabled plist))) (setq plist `(:disabled t ,@plist))) - ;; If byte-compiling, ignore this package if it doesn't meet the condition. - ;; This avoids false-positive load errors. - (unless (and (bound-and-true-p byte-compile-current-file) - (or (and (plist-member plist :if) (not (eval (plist-get plist :if) t))) - (and (plist-member plist :when) (not (eval (plist-get plist :when) t))) - (and (plist-member plist :unless) (eval (plist-get plist :unless) t)))) - `(use-package ,name ,@plist))) + `(use-package ,name ,@plist)) (defmacro def-package-hook! (package when &rest body) "Reconfigures a package's `def-package!' block.