summaryrefslogtreecommitdiff
path: root/lisp/window.el
diff options
context:
space:
mode:
authorJohn Shahid <jvshahid@gmail.com>2019-04-27 12:21:38 -0400
committerEli Zaretskii <eliz@gnu.org>2019-06-07 11:53:17 +0300
commitad9eadbe4ab9811d5b4091a18d7a09d325e75fb3 (patch)
tree4ebcc90a48e814504015b2c10fa8b3b4642cd610 /lisp/window.el
parent3a1f92d09bbcb4dbd2a2ebe1bee0e564e51c4615 (diff)
downloademacs-ad9eadbe4ab9811d5b4091a18d7a09d325e75fb3.tar.gz
emacs-ad9eadbe4ab9811d5b4091a18d7a09d325e75fb3.tar.bz2
emacs-ad9eadbe4ab9811d5b4091a18d7a09d325e75fb3.zip
Consider line spacing and font height when deriving proc window size
* lisp/window.el (window-adjust-process-window-size): Use window-screen-lines instead of window-body-height. * lisp/term.el (term-mode): Use window-screen-lines to set the initial window height.
Diffstat (limited to 'lisp/window.el')
-rw-r--r--lisp/window.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 2c9d177d0a2..0ca628f0065 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -9573,10 +9573,12 @@ a two-argument function used to combine the widths and heights of
the given windows."
(when windows
(let ((width (window-max-chars-per-line (car windows)))
- (height (window-body-height (car windows))))
+ (height (with-selected-window (car windows)
+ (floor (window-screen-lines)))))
(dolist (window (cdr windows))
(setf width (funcall reducer width (window-max-chars-per-line window)))
- (setf height (funcall reducer height (window-body-height window))))
+ (setf height (funcall reducer height (with-selected-window window
+ (floor (window-screen-lines))))))
(cons width height))))
(defun window-adjust-process-window-size-smallest (_process windows)