[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 02bb676: Rename coverage symbols in edebug to avoid
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 02bb676: Rename coverage symbols in edebug to avoid collisions |
Date: |
Sat, 27 Jul 2019 06:43:11 -0400 (EDT) |
branch: master
commit 02bb676a0547e0a25fc697d3a4c539e5415b90be
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Rename coverage symbols in edebug to avoid collisions
* lisp/emacs-lisp/edebug.el (edebug-clear-coverage): Use
edebug-unknown and edebug-ok-coverage instead of unknown and
ok-coverage to avoid naming collisions with packages that use
those two symbols (bug#25471).
(edebug--update-coverage, edebug-display-freq-count): Ditto.
---
lisp/emacs-lisp/edebug.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index ab5553b..16830b7 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1428,7 +1428,7 @@ contains a circular object."
;; Create initial coverage vector.
;; Only need one per expression, but it is simpler to use stop points.
(put name 'edebug-coverage
- (make-vector (length edebug-offset-list) 'unknown)))
+ (make-vector (length edebug-offset-list) 'edebug-unknown)))
(defun edebug-form (cursor)
@@ -2470,12 +2470,12 @@ See `edebug-behavior-alist' for implementations.")
(defun edebug--update-coverage (after-index value)
(let ((old-result (aref edebug-coverage after-index)))
(cond
- ((eq 'ok-coverage old-result))
- ((eq 'unknown old-result)
+ ((eq 'edebug-ok-coverage old-result))
+ ((eq 'edebug-unknown old-result)
(aset edebug-coverage after-index value))
;; Test if a different result.
((not (eq value old-result))
- (aset edebug-coverage after-index 'ok-coverage)))))
+ (aset edebug-coverage after-index 'edebug-ok-coverage)))))
;; Dynamically declared unbound variables.
@@ -4204,7 +4204,7 @@ reinstrument it."
(max 0 (- col (- (point) start-of-count-line))) ?\s)
(if (and (< 0 count)
(not (memq coverage
- '(unknown ok-coverage))))
+ '(edebug-unknown edebug-ok-coverage))))
"=" "")
(if (= count last-count) "" (int-to-string count))
" ")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 02bb676: Rename coverage symbols in edebug to avoid collisions,
Lars Ingebrigtsen <=