From ea175180ef4e0b32c3483e7e4c3f608059d535ac Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 29 Jul 2018 02:26:35 +0200 Subject: [PATCH] Fix incorrect load-file-name in autodef conditions Causing errors where featurep! calls in ;;;###autodef cookie conditions couldn't resolve the correct module from load-file-name. --- core/core-cli.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core-cli.el b/core/core-cli.el index 6c0666317..13cf7cfe6 100644 --- a/core/core-cli.el +++ b/core/core-cli.el @@ -469,7 +469,8 @@ even if it doesn't need reloading!" "No documentation."))) (push (cond ((not (and member-p (or (null pred) - (eval (read pred) t)))) + (let ((load-file-name path)) + (eval (read pred) t))))) (push doom-file-form forms) (setq docstring (format "THIS FUNCTION DOES NOTHING BECAUSE %s IS DISABLED\n\n%s" origin docstring)) @@ -500,7 +501,8 @@ even if it doesn't need reloading!" (target (doom-unquote target))) (unless (and member-p (or (null pred) - (eval (read pred) t))) + (let ((load-file-name path)) + (eval (read pred) t)))) (setq target #'ignore)) (push doom-file-form forms) (push `(put ',name 'doom-module ',origin) forms)