summaryrefslogtreecommitdiff
path: root/lisp/window.el
diff options
context:
space:
mode:
authorJérémy Compostella <jeremy.compostella@gmail.com>2012-01-25 15:28:01 +0100
committerMartin Rudalics <rudalics@gmx.at>2012-01-25 15:28:01 +0100
commitfa8eafefbe8418f960dc357bfad6655853be21e5 (patch)
tree06fa4410a82da505c5f9201c520f36e69fa074d6 /lisp/window.el
parent40047858c6c270c3a7eb842abcbea042bb2781fd (diff)
downloademacs-fa8eafefbe8418f960dc357bfad6655853be21e5.tar.gz
In window states don't deal with the mark.
* window.el (window--state-get-1, window--state-put-2): Don't save and restore the mark.
Diffstat (limited to 'lisp/window.el')
-rw-r--r--lisp/window.el11
1 files changed, 2 insertions, 9 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 9122904b0bb..832a08dbbc7 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3622,10 +3622,7 @@ specific buffers."
(vscroll . ,(window-vscroll window))
(dedicated . ,(window-dedicated-p window))
(point . ,(if writable point (copy-marker point)))
- (start . ,(if writable start (copy-marker start)))
- ,@(when mark
- `((mark . ,(if writable
- mark (copy-marker mark))))))))))))
+ (start . ,(if writable start (copy-marker start))))))))))
(tail
(when (memq type '(vc hc))
(let (list)
@@ -3809,11 +3806,7 @@ value can be also stored on disk and read back in a new session."
;; have been created and sized).
(ignore-errors
(set-window-start window (cdr (assq 'start state)))
- (set-window-point window (cdr (assq 'point state)))
- ;; I'm not sure whether we should set the mark here, but maybe
- ;; it can be used.
- (let ((mark (cdr (assq 'mark state))))
- (when mark (set-mark mark))))
+ (set-window-point window (cdr (assq 'point state))))
;; Select window if it's the selected one.
(when (cdr (assq 'selected state))
(select-window window)))))))