From: Martin Rudalics Date: Tue, 29 Jul 2014 15:08:30 +0000 (+0200) Subject: In window--state-put-2 handle horizontal scroll bars. X-Git-Tag: emacs-25.0.90~2636^3~8 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca74eaca07e52cabd7fd14fdd9e73aa502b2d210;p=emacs.git 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 b8477293e76..a89b46bf144 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-07-29 Martin Rudalics + + * window.el (window--state-put-2): Handle horizontal scroll + bars, if present. + 2014-07-29 Rüdiger Sonderfeld * 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))