summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-07-27 12:21:30 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-07-27 12:21:30 +0200
commit02bb676a0547e0a25fc697d3a4c539e5415b90be (patch)
tree60ba0c5a3be11b356f284248b08967d243d2e8e0 /lisp/emacs-lisp
parent0779b1c31d27c348f6f2a94c5aa1a64de855a39d (diff)
downloademacs-02bb676a0547e0a25fc697d3a4c539e5415b90be.tar.gz
emacs-02bb676a0547e0a25fc697d3a4c539e5415b90be.tar.bz2
emacs-02bb676a0547e0a25fc697d3a4c539e5415b90be.zip
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.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/edebug.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index ab5553b4e83..16830b79bd1 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))
" ")