branch: externals/compat commit b22fa5096f15713895d1cb750d4c16938e936ed2 Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
Execute check inside of with-eval-after-load block --- compat-macs.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compat-macs.el b/compat-macs.el index 354e3abc74..dae0a9bd8a 100644 --- a/compat-macs.el +++ b/compat-macs.el @@ -107,15 +107,14 @@ DEF-FN, INSTALL-FN, CHECK-FN and ATTR." (when (and (version<= version emacs-version) (fboundp actual-name) check) - `(,@check ,(compat--with-feature feature - (funcall install-fn actual-name version))))))) + (compat--with-feature feature + `(,@check ,(funcall install-fn actual-name version))))))) ((plist-get attr :realname) `(progn ,(funcall def-fn realname version) - ,(and check - `(,@check - ,(compat--with-feature feature - (funcall install-fn realname version)))))) + ,(when check + (compat--with-feature feature + `(,@check ,(funcall install-fn realname version)))))) (check (compat--with-feature feature `(,@check ,(funcall def-fn name version)))))))