2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8477293e76..a89b46bf144 100644
--- 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 f55f0657a30..28a2be00af9 100644
--- 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))