]> git.eshelyaron.com Git - emacs.git/commitdiff
(with-demoted-errors): Fix bug#54225
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 3 Mar 2022 15:12:44 +0000 (10:12 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 3 Mar 2022 15:12:44 +0000 (10:12 -0500)
* lisp/subr.el (with-demoted-errors): Adjust to argument order of
`macroexp-warn-and-return` changed in f262a6af3694b41828ff.

lisp/subr.el

index eb9af0b36dac105b8bac652621c08ff774ac7dfc..2321765f9530b8045dbc39855741d95fca07ffcf 100644 (file)
@@ -4560,7 +4560,7 @@ but that should be robust in the unexpected case that an error is signaled."
     (if (eq orig-body body) exp
       ;; The use without `format' is obsolete, let's warn when we bump
       ;; into any such remaining uses.
-      (macroexp-warn-and-return format "Missing format argument" exp))))
+      (macroexp-warn-and-return "Missing format argument" exp nil nil format))))
 
 (defmacro combine-after-change-calls (&rest body)
   "Execute BODY, but don't call the after-change functions till the end.