summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/edebug.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-03-22 16:11:53 +0000
committerAndrea Corallo <akrl@sdf.org>2020-03-22 16:11:53 +0000
commiteb1d22b136a3f7a49b4060553b79ee188f55a498 (patch)
tree9f9e5ddc960b8484bc6e9413ee7bb155abb066f3 /lisp/emacs-lisp/edebug.el
parent855940df6bde5ed41ed55336a3ac6f6ae0c6267e (diff)
parent813478c8557541efa918de18f7d863a33210a598 (diff)
downloademacs-eb1d22b136a3f7a49b4060553b79ee188f55a498.tar.gz
emacs-eb1d22b136a3f7a49b4060553b79ee188f55a498.tar.bz2
emacs-eb1d22b136a3f7a49b4060553b79ee188f55a498.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
-rw-r--r--lisp/emacs-lisp/edebug.el1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 85cc8c8e7ad..bb7817f242c 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2845,7 +2845,6 @@ See `edebug-behavior-alist' for implementations.")
(if (not (eq edebug-buffer edebug-outside-buffer))
(goto-char edebug-outside-point))
(if (marker-buffer (edebug-mark-marker))
- ;; Does zmacs-regions need to be nil while doing set-marker?
(set-marker (edebug-mark-marker) edebug-outside-mark))
)) ; unwind-protect
;; None of the following is done if quit or signal occurs.