[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 560c15a04f9: ; * lisp/emacs-lisp/macroexp.el (macroexp--expand-al
From: |
Mattias Engdegård |
Subject: |
master 560c15a04f9: ; * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): minor tweaks |
Date: |
Mon, 12 Jun 2023 04:25:15 -0400 (EDT) |
branch: master
commit 560c15a04f9578d607c68e63a04901dce924b227
Author: Mattias Engdegård <mattiase@acm.org>
Commit: Mattias Engdegård <mattiase@acm.org>
; * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): minor tweaks
Don't lose `funcall` symbol position. Remove outdated comment.
---
lisp/emacs-lisp/macroexp.el | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index b05aba3e1a7..8a0185d597b 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -458,7 +458,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
((and `#',f
(guard (not (or (special-form-p f) (macrop f))))) ;;
bug#46636
(macroexp--expand-all `(,f . ,eargs)))
- (_ `(funcall ,eexp . ,eargs)))))
+ (_ `(,fn ,eexp . ,eargs)))))
(`(funcall . ,_) form) ;bug#53227
(`(,func . ,_)
(let ((handler (function-get func 'compiler-macro))
@@ -479,9 +479,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
;; byte-optimize-form because the output of the compiler-macro
can
;; use macros.
(if (null handler)
- ;; No compiler macro. We just expand each argument (for
- ;; setq/setq-default this works alright because the
variable names
- ;; are symbols).
+ ;; No compiler macro. We just expand each argument.
(macroexp--all-forms form 1)
;; If the handler is not loaded yet, try (auto)loading the
;; function itself, which may in turn load the handler.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 560c15a04f9: ; * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): minor tweaks,
Mattias Engdegård <=