[Emacs-diffs] trunk r117608: In window--state-put-2 handle horizontal scroll bars.

[Martin Rudalics]

------------------------------------------------------------
revno: 117608
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2014-07-29 17:08:30 +0200
message:
  In window--state-put-2 handle horizontal scroll bars.
  
  * window.el (window--state-put-2): Handle horizontal scroll
  bars, if present.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-29 14:21:11 +0000
+++ b/lisp/ChangeLog    2014-07-29 15:08:30 +0000
@@ -1,3 +1,8 @@
+2014-07-29  Martin Rudalics  <address@hidden>
+
+       * window.el (window--state-put-2): Handle horizontal scroll
+       bars, if present.
+
 2014-07-29  Rüdiger Sonderfeld  <address@hidden>
 
        * menu-bar.el (menu-bar-update-buffers): Update item list format

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2014-07-28 09:39:09 +0000
+++ b/lisp/window.el    2014-07-29 15:08:30 +0000
@@ -5121,7 +5121,7 @@
                (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))