procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

In balance-windows-area don't call window-height and window-width. Bug#16241.

Browse source 
* window.el (balance-windows-area): Call window-size instead of
window-height and window-width.  Bug#16241.
This commit is contained in:
Martin Rudalics 2013-12-24 17:42:03 +01:00
parent a956004715
commit 18cee9eca2
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-12-24 Martin Rudalics <rudalics@gmx.at>
* window.el (balance-windows-area): Call window-size instead of
window-height and window-width. Bug#16241.
2013-12-24 Lars Ingebrigtsen <larsi@gnus.org>
* net/eww.el (eww-bookmark-quit): Remove.

16
lisp/window.el
View file

@ -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.