procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix edebug--restore-breakpoints re-instrumentinging bug-out

Browse source 
* lisp/emacs-lisp/edebug.el (edebug--restore-breakpoints): Don't
bug out when instrumenting/de-instrumenting/re-instrumenting.
This commit is contained in:
Lars Ingebrigtsen 2019-10-20 14:27:38 +02:00
parent 34744278ba
commit 34963d632d
1 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lisp/emacs-lisp/edebug.el
View file

@ -1415,23 +1415,24 @@ contains a circular object."
)))
(defun edebug--restore-breakpoints (name)
(let* ((data (get name 'edebug))
(offsets (nth 2 data))
(breakpoints (nth 1 data))
(start (nth 0 data))
index)
;; Breakpoints refer to offsets from the start of the function.
;; The start position is a marker, so it'll move around in a
;; similar fashion as the breakpoint markers. If we find a
;; breakpoint marker that refers to an offset (which is a place
;; where breakpoints can be made), then we restore it.
(cl-loop for breakpoint in breakpoints
for marker = (nth 3 breakpoint)
when (and (marker-position marker)
(setq index (seq-position
offsets
(- (marker-position marker) start))))
collect (cons index (cdr breakpoint)))))
(let ((data (get name 'edebug)))
(when (listp data)
(let ((offsets (nth 2 data))
(breakpoints (nth 1 data))
(start (nth 0 data))
index)
;; Breakpoints refer to offsets from the start of the function.
;; The start position is a marker, so it'll move around in a
;; similar fashion as the breakpoint markers. If we find a
;; breakpoint marker that refers to an offset (which is a place
;; where breakpoints can be made), then we restore it.
(cl-loop for breakpoint in breakpoints
for marker = (nth 3 breakpoint)
when (and (marker-position marker)
(setq index (seq-position
offsets
(- (marker-position marker) start))))
collect (cons index (cdr breakpoint)))))))
(defun edebug-new-definition (def-name)
"Set up DEF-NAME to use Edebug's instrumentation functions."