2 files changed, 7 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a47a9f0ece..7a31115ac5d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-25  Jérémy Compostella  <jeremy.compostella@gmail.com>
+
+        * window.el (window--state-get-1, window--state-put-2): Don't
+        save and restore the mark.
+
 2012-01-25  Chong Yidong  <cyd@gnu.org>
 
         * custom.el (custom-variable-p): Doc fix.
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)))))))