Don't let window start override window point in `window-state-put' (Bug#24240)

* lisp/window.el (window--state-put-2): Set 'noforce argument
when restoring a window's start position.  This avoids that the
effect of `set-window-point' gets overidden by that of
`set-window-start' (Bug#24240).

diff --git a/lisp/window.el b/lisp/window.el
index 11d7a4e90d4612c916ac0b794ad979f3dcbf191a..4699e2c5e562b00fb107fc6b77b556b97218307c 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5497,7 +5497,9 @@ value can be also stored on disk and read back in a new session."
                ;; Install positions (maybe we should do this after all
                ;; windows have been created and sized).
                (ignore-errors
-                 (set-window-start window (cdr (assq 'start state)))
+                  ;; Set 'noforce argument to avoid that window start
+                  ;; overrides window point set below (Bug#24240).
+                 (set-window-start window (cdr (assq 'start state)) 'noforce)
                  (set-window-point window (cdr (assq 'point state))))
                ;; Select window if it's the selected one.
                (when (cdr (assq 'selected state))