[Emacs-diffs] trunk r115458: * lisp/emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark.

[Stefan Monnier]

------------------------------------------------------------
revno: 115458
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-11 09:27:15 -0500
message:
  * lisp/emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/trace.el       trace.el-20091113204419-o5vbwnq5f7feedwu-569

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-11 14:22:26 +0000
+++ b/lisp/ChangeLog    2013-12-11 14:27:15 +0000
@@ -1,5 +1,7 @@
 2013-12-11  Stefan Monnier  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/emacs-lisp/trace.el'
--- a/lisp/emacs-lisp/trace.el  2013-05-29 15:17:12 +0000
+++ b/lisp/emacs-lisp/trace.el  2013-12-11 14:27:15 +0000
@@ -222,6 +222,7 @@
   (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