summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/trace.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-12-11 19:06:29 +0200
committerEli Zaretskii <eliz@gnu.org>2013-12-11 19:06:29 +0200
commita34a8cd1e46594c5776f187dd98583bcb82f9bc0 (patch)
tree92503ed7f7d3fb3c73c38d4689611b8202682970 /lisp/emacs-lisp/trace.el
parent8b55eeeb70be4b4ff3dd4694013bdb1a9f668bc6 (diff)
parent1421be8445803bdb9c3fece8c658836b5f0f9c34 (diff)
downloademacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.tar.gz
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/trace.el')
-rw-r--r--lisp/emacs-lisp/trace.el1
1 files changed, 1 insertions, 0 deletions
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