aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-07-27 12:21:30 +0200
committerLars Ingebrigtsen2019-07-27 12:21:30 +0200
commit02bb676a0547e0a25fc697d3a4c539e5415b90be (patch)
tree60ba0c5a3be11b356f284248b08967d243d2e8e0
parent0779b1c31d27c348f6f2a94c5aa1a64de855a39d (diff)
downloademacs-02bb676a0547e0a25fc697d3a4c539e5415b90be.tar.gz
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.
-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."
1428 ;; Create initial coverage vector. 1428 ;; Create initial coverage vector.
1429 ;; Only need one per expression, but it is simpler to use stop points. 1429 ;; Only need one per expression, but it is simpler to use stop points.
1430 (put name 'edebug-coverage 1430 (put name 'edebug-coverage
1431 (make-vector (length edebug-offset-list) 'unknown))) 1431 (make-vector (length edebug-offset-list) 'edebug-unknown)))
1432 1432
1433 1433
1434(defun edebug-form (cursor) 1434(defun edebug-form (cursor)
@@ -2470,12 +2470,12 @@ See `edebug-behavior-alist' for implementations.")
2470(defun edebug--update-coverage (after-index value) 2470(defun edebug--update-coverage (after-index value)
2471 (let ((old-result (aref edebug-coverage after-index))) 2471 (let ((old-result (aref edebug-coverage after-index)))
2472 (cond 2472 (cond
2473 ((eq 'ok-coverage old-result)) 2473 ((eq 'edebug-ok-coverage old-result))
2474 ((eq 'unknown old-result) 2474 ((eq 'edebug-unknown old-result)
2475 (aset edebug-coverage after-index value)) 2475 (aset edebug-coverage after-index value))
2476 ;; Test if a different result. 2476 ;; Test if a different result.
2477 ((not (eq value old-result)) 2477 ((not (eq value old-result))
2478 (aset edebug-coverage after-index 'ok-coverage))))) 2478 (aset edebug-coverage after-index 'edebug-ok-coverage)))))
2479 2479
2480 2480
2481;; Dynamically declared unbound variables. 2481;; Dynamically declared unbound variables.
@@ -4204,7 +4204,7 @@ reinstrument it."
4204 (max 0 (- col (- (point) start-of-count-line))) ?\s) 4204 (max 0 (- col (- (point) start-of-count-line))) ?\s)
4205 (if (and (< 0 count) 4205 (if (and (< 0 count)
4206 (not (memq coverage 4206 (not (memq coverage
4207 '(unknown ok-coverage)))) 4207 '(edebug-unknown edebug-ok-coverage))))
4208 "=" "") 4208 "=" "")
4209 (if (= count last-count) "" (int-to-string count)) 4209 (if (= count last-count) "" (int-to-string count))
4210 " ") 4210 " ")