From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 11 Dec 2013 14:27:15 +0000 (-0500)
Subject: * lisp/emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~477
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e82af72d50e789123f3aba16c7389c688c49469a;p=emacs.git

* lisp/emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4eabc0cc50..2b1b2fe97c0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-12-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark.
+
 	* simple.el (normal-erase-is-backspace-mode): Map kp-delete identically
 	to `delete' (bug#16109).
 
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index f605c2865c0..3a2c44a8da6 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -222,6 +222,7 @@ be printed along with the arguments in the trace."
   (lambda (body &rest args)
     (let ((trace-level (1+ trace-level))
           (trace-buffer (get-buffer-create buffer))
+          (deactivate-mark nil)         ;Protect deactivate-mark.
           (ctx (funcall context)))
       (unless inhibit-trace
         (with-current-buffer trace-buffer