diff options
| author | Stefan Monnier | 2022-03-03 10:12:44 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2022-03-03 10:12:44 -0500 |
| commit | dc8a692f97fdafaa31001ab0620394525103ddb7 (patch) | |
| tree | 9f99cb51dd0865ad50ba6cac79418994a3f1f688 | |
| parent | b6587090bfa192efc4db5ac181a9dfd5ee8c0c08 (diff) | |
| download | emacs-dc8a692f97fdafaa31001ab0620394525103ddb7.tar.gz emacs-dc8a692f97fdafaa31001ab0620394525103ddb7.zip | |
(with-demoted-errors): Fix bug#54225
* lisp/subr.el (with-demoted-errors): Adjust to argument order of
`macroexp-warn-and-return` changed in f262a6af3694b41828ff.
| -rw-r--r-- | lisp/subr.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index eb9af0b36da..2321765f953 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -4560,7 +4560,7 @@ but that should be robust in the unexpected case that an error is signaled." | |||
| 4560 | (if (eq orig-body body) exp | 4560 | (if (eq orig-body body) exp |
| 4561 | ;; The use without `format' is obsolete, let's warn when we bump | 4561 | ;; The use without `format' is obsolete, let's warn when we bump |
| 4562 | ;; into any such remaining uses. | 4562 | ;; into any such remaining uses. |
| 4563 | (macroexp-warn-and-return format "Missing format argument" exp)))) | 4563 | (macroexp-warn-and-return "Missing format argument" exp nil nil format)))) |
| 4564 | 4564 | ||
| 4565 | (defmacro combine-after-change-calls (&rest body) | 4565 | (defmacro combine-after-change-calls (&rest body) |
| 4566 | "Execute BODY, but don't call the after-change functions till the end. | 4566 | "Execute BODY, but don't call the after-change functions till the end. |