In window--state-put-2 handle horizontal scroll bars.

* window.el (window--state-put-2): Handle horizontal scroll
bars, if present.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8477293e76e4a434dd1df3bbe15a3143dadac4e..a89b46bf144c776fdd60b49c05d0a3ee53943e66 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-29  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (window--state-put-2): Handle horizontal scroll
+       bars, if present.
+
 2014-07-29  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
        * menu-bar.el (menu-bar-update-buffers): Update item list format

diff --git a/lisp/window.el b/lisp/window.el
index f55f0657a30af30716809696ff66a869d592268e..28a2be00af92442cfadc454221a1ed747f51e584 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5121,7 +5121,7 @@ value can be also stored on disk and read back in a new session."
                (let ((scroll-bars (cdr (assq 'scroll-bars state))))
                  (set-window-scroll-bars
                   window (car scroll-bars) (nth 2 scroll-bars)
-                  (nth 3 scroll-bars)))
+                  (or (nth 3 scroll-bars) 0) (nth 5 scroll-bars)))
                (set-window-vscroll window (cdr (assq 'vscroll state)))
                ;; Adjust vertically.
                (if (memq window-size-fixed '(t height))