[Emacs-diffs] /srv/bzr/emacs/trunk r106931: In window states don't deal with the mark.

[martin rudalics]

------------------------------------------------------------
revno: 106931
author: Jeremy Compostella  <address@hidden>
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2012-01-25 15:28:01 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-25 08:20:24 +0000
+++ b/lisp/ChangeLog    2012-01-25 14:28:01 +0000
@@ -1,3 +1,8 @@
+2012-01-25  Jérémy Compostella  <address@hidden>
+
+       * window.el (window--state-get-1, window--state-put-2): Don't
+       save and restore the mark.
+
 2012-01-25  Chong Yidong  <address@hidden>
 
        * custom.el (custom-variable-p): Doc fix.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2012-01-19 10:38:31 +0000
+++ b/lisp/window.el    2012-01-25 14:28:01 +0000
@@ -3622,10 +3622,7 @@
                        (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 @@
          ;; 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)))))))