diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2013-12-24 17:42:03 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2013-12-24 17:42:03 +0100 |
| commit | 18cee9eca2aa558bebc4ee18cb5bc0503a85d9f2 (patch) | |
| tree | f217ed46523fb4258ff09f2a9f442fb184c402e8 /lisp/window.el | |
| parent | a956004715d4c299a12c6840eda514421e9c38e7 (diff) | |
| download | emacs-18cee9eca2aa558bebc4ee18cb5bc0503a85d9f2.tar.gz | |
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.
Diffstat (limited to 'lisp/window.el')
| -rw-r--r-- | lisp/window.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/window.el b/lisp/window.el index 3b841747205..b58f8b85815 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4681,12 +4681,12 @@ specific buffers." ;; (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 @@ specific buffers." (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. |