From 7ac29bbd270b6cb35aad168d50088adc58f74f1d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 17 Feb 2018 19:09:15 -0500 Subject: [PATCH] Refactor require! macro --- core/core-packages.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index 0fb80e75f..36afc6fb7 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -407,10 +407,8 @@ The module is only loaded once. If RELOAD-P is non-nil, load it again." (if (file-directory-p module-path) `(condition-case-unless-debug ex (let ((doom--current-module (cons module submodule))) - (load ,(doom-module-path module submodule "init") - :noerror (not doom-debug-mode)) - (load ,(doom-module-path module submodule "config") - :noerror (not doom-debug-mode))) + (load! init ,module-path :noerror) + (load! config ,module-path :noerror)) ('error (lwarn 'doom-modules :error "%s in '%s %s' -> %s"