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

* lisp/emacs-lisp/edebug.el (edebug--display): Save-excursion.

Browse source 
Fixes: debbugs:19611

* lisp/emacs-lisp/debug.el (debugger-env-macro): Remove redundant
save-excursion.
This commit is contained in:
Stefan Monnier 2015-02-25 01:03:14 -05:00
parent b86ba30d17
commit 8bb64d2722
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2015-02-25 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/edebug.el (edebug--display): Save-excursion (bug#19611).
* emacs-lisp/debug.el (debugger-env-macro): Remove redundant
save-excursion.
2015-02-24 Glenn Morris <rgm@gnu.org>
* mail/rmailsum.el (rmail-summary-previous-all)

6
lisp/emacs-lisp/debug.el
View file

@ -535,11 +535,7 @@ Applies to the frame whose line point is on in the backtrace."
(defmacro debugger-env-macro (&rest body)
"Run BODY in original environment."
(declare (indent 0))
`(save-excursion
(if (null (buffer-live-p debugger-old-buffer))
;; old buffer deleted
(setq debugger-old-buffer (current-buffer)))
(set-buffer debugger-old-buffer)
`(progn
(set-match-data debugger-outer-match-data)
(prog1
(progn ,@body)

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

@ -2358,6 +2358,12 @@ MSG is printed after `::::} '."
(defalias 'edebug-mark-marker 'mark-marker)
(defun edebug--display (value offset-index arg-mode)
;; edebug--display-1 is too big, we should split it. This function
;; here was just introduced to avoid making edebug--display-1
;; yet a bit deeper.
(save-excursion (edebug--display-1 value offset-index arg-mode)))
(defun edebug--display-1 (value offset-index arg-mode)
(unless (marker-position edebug-def-mark)
;; The buffer holding the source has been killed.
;; Let's at least show a backtrace so the user can figure out
@ -3317,6 +3323,9 @@ Return the result of the last expression."
;; Restore outside context.
(setq-default cursor-in-non-selected-windows edebug-outside-d-c-i-n-s-w)
(unwind-protect
;; FIXME: This restoring of edebug-outside-buffer and
;; edebug-outside-point is redundant now that backtrace-eval does it
;; for us.
(with-current-buffer edebug-outside-buffer ; of edebug-buffer
(goto-char edebug-outside-point)
(if (marker-buffer (edebug-mark-marker))