>From fb68050a5d6ed714d8f80c5a3cb47e5755dd7127 Mon Sep 17 00:00:00 2001 From: Jeremy Compostella Date: Thu, 19 Jan 2012 14:33:32 +0100 Subject: [PATCH] window.el: Remove mark saving and restoring As long as I know mark is related to a buffer and not to a window. It should be saved by buffer functions and not window functions. Moreover, when I call window-state-put on a window-state-get previously stored the mark is changed and activated which does not look like the desired behavior. Signed-off-by: Jeremy Compostella --- lisp/window.el | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/lisp/window.el b/lisp/window.el index 54e5ec9..c6e9605 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -3612,11 +3612,10 @@ specific buffers." `((parameters . ,list)))) ,@(when buffer ;; All buffer related things go in here - make the buffer - ;; current when retrieving `point' and `mark'. + ;; current when retrieving `point' and `start'. (with-current-buffer (window-buffer window) (let ((point (window-point-1 window)) - (start (window-start window)) - (mark (mark t))) + (start (window-start window))) `((buffer ,(buffer-name buffer) (selected . ,selected) @@ -3629,10 +3628,7 @@ specific buffers." (vscroll . ,(window-vscroll window)) (dedicated . ,(window-dedicated-p window)) (point . ,(if ignore point (copy-marker point))) - (start . ,(if ignore start (copy-marker start))) - ,@(when mark - `((mark . ,(if ignore - mark (copy-marker mark)))))))))))) + (start . ,(if ignore start (copy-marker start)))))))))) (tail (when (memq type '(vc hc)) (let (list) @@ -3815,11 +3811,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))))))) -- 1.7.2.5