summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-11-15 09:00:49 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2019-11-15 09:00:53 +0100
commitecc21845eaac931dc12ac5057296fbf742336a02 (patch)
treed14095abaca0eb543e499f3bacaeaaacc0415494
parent06ac04a8ec4fd5ff3f51a174192511a75d104822 (diff)
downloademacs-ecc21845eaac931dc12ac5057296fbf742336a02.tar.gz
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).
-rw-r--r--lisp/emacs-lisp/edebug.el5
1 files 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)))))