diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-12-11 09:27:15 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-12-11 09:27:15 -0500 |
| commit | e82af72d50e789123f3aba16c7389c688c49469a (patch) | |
| tree | cb9f6ff454afb8b9bb01578e1f072cbaca9c6e0d /lisp | |
| parent | afdadaf7b6a39320445ca46d365ff9f51ad7c0e2 (diff) | |
* lisp/emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/trace.el | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e4eabc0cc5..2b1b2fe97c 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 f605c2865c..3a2c44a8da 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 |