[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#54225: [PATCH] with-demoted-errors: Fix macroexp-warn-and-return cal
From: |
Stefan Monnier |
Subject: |
bug#54225: [PATCH] with-demoted-errors: Fix macroexp-warn-and-return call |
Date: |
Thu, 03 Mar 2022 10:14:04 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) |
Kyle Meyer [2022-03-02 22:00:35] wrote:
> The macroexp-warn-and-return call added to with-demoted-errors in
> d52c929e31f (2022-02-04) is incorrect. The with-demoted-errors format
> string is passed as MSG, the actual message is passed as FORM, and the
> form is passed as CATEGORY, leading to with-demoted-errors returning
> "Missing format argument".
>
> * lisp/subr.el (with-demoted-errors): Call macroexp-warn-and-return
> with correct arguments.
> ---
> lisp/subr.el | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lisp/subr.el b/lisp/subr.el
> index eb9af0b36da..7dde7589dd9 100644
> --- a/lisp/subr.el
> +++ b/lisp/subr.el
> @@ -4560,7 +4560,7 @@ with-demoted-errors
> (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))))
>
> (defmacro combine-after-change-calls (&rest body)
> "Execute BODY, but don't call the after-change functions till the end.
>
> base-commit: 543640628607ec06e9698cc50c33497ca75155a4
Thanks. I used the patch below, instead.
Stefan
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 @@ with-demoted-errors
(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.