diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-12-11 19:06:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-12-11 19:06:29 +0200 |
| commit | a34a8cd1e46594c5776f187dd98583bcb82f9bc0 (patch) | |
| tree | 92503ed7f7d3fb3c73c38d4689611b8202682970 /lisp/emacs-lisp | |
| parent | 8b55eeeb70be4b4ff3dd4694013bdb1a9f668bc6 (diff) | |
| parent | 1421be8445803bdb9c3fece8c658836b5f0f9c34 (diff) | |
| download | emacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.tar.gz emacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.tar.bz2 emacs-a34a8cd1e46594c5776f187dd98583bcb82f9bc0.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/trace.el | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index f025a8b400b..1c468e013d6 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1165,7 +1165,7 @@ the beginning of a line." (forward-char 1)) (skip-chars-forward " \t") (or (eolp) - (and (looking-at comment-start-skip) + (and ;; (looking-at comment-start-skip) ;(bug#16041). (forward-comment (point-max)))) (point)))))) 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 |