From ecc21845eaac931dc12ac5057296fbf742336a02 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 15 Nov 2019 09:00:49 +0100 Subject: [PATCH] Make edebug-remove-instrumentation remove macro instrumentation * lisp/emacs-lisp/edebug.el (edebug-remove-instrumentation): Macros can also have edebug instrumentation, so remove that as well (bug#38195). --- lisp/emacs-lisp/edebug.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 6b55d7cff03..5d527044108 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -4580,8 +4580,9 @@ instrumentation for, defaulting to all functions." (let ((functions nil)) (mapatoms (lambda (symbol) - (when (and (functionp symbol) - (get symbol 'edebug)) + (when (and (get symbol 'edebug) + (or (functionp symbol) + (macrop symbol))) (let ((unwrapped (edebug-unwrap* (symbol-function symbol)))) (unless (equal unwrapped (symbol-function symbol)) (push symbol functions))))) -- 2.39.5