(macroexp-warn-and-return): Fix bug#53618

* lisp/emacs-lisp/macroexp.el (macroexp-warn-and-return):
Reorder arguments to preserve compatibility with that of Emacs-28.
(macroexp--unfold-lambda, macroexp--expand-all):
* lisp/emacs-lisp/pcase.el (pcase-compile-patterns, pcase--u1):
* lisp/emacs-lisp/gv.el (gv-ref):
* lisp/emacs-lisp/eieio.el (defclass):
* lisp/emacs-lisp/eieio-core.el (eieio-oref, eieio-oref-default)
(eieio-oset-default):
* lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
* lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet, cl-defstruct):
* lisp/emacs-lisp/cl-generic.el (cl-defmethod):
* lisp/emacs-lisp/byte-run.el (defmacro, defun):
* lisp/emacs-lisp/bindat.el (bindat--type): Adjust accordingly.
This commit is contained in:
Stefan Monnier 2022-02-19 14:20:02 -05:00
parent c3e064013e
commit f262a6af36
10 changed files with 28 additions and 50 deletions

View file

@ -311,11 +311,10 @@ The return value is undefined.
(let ((f (cdr (assq (car x) macro-declarations-alist))))
(if f (apply (car f) name arglist (cdr x))
(macroexp-warn-and-return
(car x)
(format-message
"Unknown macro property %S in %S"
(car x) name)
nil))))
nil nil nil (car x)))))
decls)))
;; Refresh font-lock if this is a new macro, or it is an
;; existing macro whose 'no-font-lock-keyword declaration
@ -385,10 +384,9 @@ The return value is undefined.
nil)
(t
(macroexp-warn-and-return
(car x)
(format-message "Unknown defun property `%S' in %S"
(car x) name)
nil)))))
nil nil nil (car x))))))
decls))
(def (list 'defalias
(list 'quote name)