[Emacs-diffs] trunk r115730: In balance-windows-area don't call window-height and window-width. Bug#16241.

[Martin Rudalics]

------------------------------------------------------------
revno: 115730
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-24 17:42:03 +0100
message:
  In balance-windows-area don't call window-height and window-width.  Bug#16241.
  
  * window.el (balance-windows-area): Call window-size instead of
  window-height and window-width.  Bug#16241.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-24 07:25:27 +0000
+++ b/lisp/ChangeLog    2013-12-24 16:42:03 +0000
@@ -1,3 +1,8 @@
+2013-12-24  Martin Rudalics  <address@hidden>
+
+       * window.el (balance-windows-area): Call window-size instead of
+       window-height and window-width.  Bug#16241.
+
 2013-12-24  Lars Ingebrigtsen  <address@hidden>
 
        * net/eww.el (eww-bookmark-quit): Remove.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2013-12-20 10:48:36 +0000
+++ b/lisp/window.el    2013-12-24 16:42:03 +0000
@@ -4681,12 +4681,12 @@
         ;; (assert (eq next (or (cadr (member win wins)) (car wins))))
         (let* ((horiz
                 (< (car (window-pixel-edges win)) (car (window-pixel-edges 
next))))
-               (areadiff (/ (- (* (window-height next pixelwise)
-                                 (window-width next pixelwise)
+               (areadiff (/ (- (* (window-size next nil pixelwise)
+                                 (window-size next t pixelwise)
                                   (buffer-local-value 'window-area-factor
                                                       (window-buffer next)))
-                               (* (window-height win pixelwise)
-                                 (window-width win pixelwise)
+                               (* (window-size win nil pixelwise)
+                                 (window-size win t pixelwise)
                                   (buffer-local-value 'window-area-factor
                                                       (window-buffer win))))
                             (max (buffer-local-value 'window-area-factor
@@ -4694,10 +4694,10 @@
                                  (buffer-local-value 'window-area-factor
                                                      (window-buffer next)))))
                (edgesize (if horiz
-                             (+ (window-height win pixelwise)
-                               (window-height next pixelwise))
-                           (+ (window-width win pixelwise)
-                             (window-width next pixelwise))))
+                             (+ (window-size win nil pixelwise)
+                               (window-size next nil pixelwise))
+                           (+ (window-size win t pixelwise)
+                             (window-size next t pixelwise))))
                (diff (/ areadiff edgesize)))
           (when (zerop diff)
             ;; Maybe diff is actually closer to 1 than to 0.