summaryrefslogtreecommitdiff
path: root/lisp/desktop.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-11-21 13:01:40 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2014-11-21 13:01:40 -0500
commitbf642130c1694c4c4cb0b981d3fa3044db6ed5fe (patch)
tree2ffc50dd4e3802b9ec1027da82f1498e960a2bca /lisp/desktop.el
parentc39443c1d651bab2eb023f4c38db418c3dc04160 (diff)
downloademacs-bf642130c1694c4c4cb0b981d3fa3044db6ed5fe.tar.gz
* lisp/desktop.el (desktop-create-buffer): Use activate-mark to set
`mark-active' (bug#19058).
Diffstat (limited to 'lisp/desktop.el')
-rw-r--r--lisp/desktop.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 360ff48339b..bad0073fbba 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1413,8 +1413,8 @@ after that many seconds of idle time."
(if (consp desktop-buffer-mark)
(progn
(move-marker (mark-marker) (car desktop-buffer-mark))
- ;; FIXME: Should we call (de)activate-mark instead?
- (setq mark-active (car (cdr desktop-buffer-mark))))
+ (if (car (cdr desktop-buffer-mark))
+ (activate-mark 'dont-touch-tmm)))
(move-marker (mark-marker) desktop-buffer-mark)))
;; Never override file system if the file really is read-only marked.
(when desktop-buffer-read-only (setq buffer-read-only desktop-buffer-read-only))