[Emacs-diffs] trunk r115912: Fix Bugs 16351 and 16383 when rounding in balance-windows-2.

[Martin Rudalics]

------------------------------------------------------------
revno: 115912
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2014-01-07 18:16:24 +0100
message:
  Fix Bugs 16351 and 16383 when rounding in balance-windows-2.
  
  * window.el (balance-windows-2): While rounding don't give a
  window more than the remainder.  Bug#16351, Bug#16383.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-07 16:50:03 +0000
+++ b/lisp/ChangeLog    2014-01-07 17:16:24 +0000
@@ -1,3 +1,8 @@
+2014-01-07  Martin Rudalics  <address@hidden>
+
+       * window.el (balance-windows-2): While rounding don't give a
+       window more than the remainder.  Bug#16351, Bug#16383.
+
 2014-01-07  Glenn Morris  <address@hidden>
 
        * menu-bar.el (menu-bar-help-extra-packages): Remove.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2014-01-05 16:29:44 +0000
+++ b/lisp/window.el    2014-01-07 17:16:24 +0000
@@ -4541,7 +4541,7 @@
     (setq sub first)
     (while (and sub (> rest 0))
       (unless (window--resize-child-windows-skip-p window)
-       (set-window-new-pixel sub char-size t)
+       (set-window-new-pixel sub (min rest char-size) t)
        (setq rest (- rest char-size)))
       (setq sub (window-right sub)))
 
@@ -4550,7 +4550,7 @@
     (setq sub first)
     (while (and sub (> rest 0))
       (unless (eq (window-new-normal sub) 'ignore)
-       (set-window-new-pixel sub char-size t)
+       (set-window-new-pixel sub (min rest char-size) t)
        (setq rest (- rest char-size)))
       (setq sub (window-right sub)))