1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 08:11:05 -08:00

Insert symbol `debug' into two condition-case handlers

This fixes bug#65622.  Also correct a mismatch between a
function to which advice is added, and that from which it is
removed.

* lisp/emacs-lisp/macroexp.el (internal-macroexpand-for-load):
Add a `debug' to the condition-case handler for `error', so
that a useful backtrace will be produced on a macro expansion
error.

* lisp/progmodes/elisp-mode.el (elisp--local-variables): Add
`debug' to a condition-case handler, as above.  In the
advice-remove call, give the same function, macroexpand-1, as
in the corresponding advice-add call.
This commit is contained in:
Alan Mackenzie 2023-09-20 15:51:17 +00:00
parent 5792ea14ad
commit f931cebce7
2 changed files with 4 additions and 4 deletions

View file

@ -812,7 +812,7 @@ test of free variables in the following ways:
(if full-p
(macroexpand--all-toplevel form)
(macroexpand form)))
(error
((debug error)
;; Hopefully this shouldn't happen thanks to the cycle detection,
;; but in case it does happen, let's catch the error and give the
;; code a chance to macro-expand later.