From: Mattias Engdegård <mattiase@acm.org>
Date: Sat, 17 Dec 2022 17:20:48 +0000 (+0100)
Subject: Fix compiler macro expansion bug
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=68fb06f47fd09d36a3d1d35a4d24bf40489bea19;p=emacs.git

Fix compiler macro expansion bug

* lisp/emacs-lisp/macroexp.el (macroexp--expand-all):
When a compiler-macro handler is re-invoked (after macro-expanding
arguments), actually use the result instead of pointlessly dropping it
on the floor.
---

diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index f4df40249de..8953e5fd019 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -486,7 +486,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
                          (setq form (macroexp--compiler-macro handler newform))
                          (if (eq newform form)
                              newform
-                           (macroexp--expand-all newform)))
+                           (macroexp--expand-all form)))
                      (macroexp--expand-all newform))))))
             (_ form))))
     (pop byte-compile-form-stack)))