Commit ad9eadbe authored by John Shahid's avatar John Shahid Committed by Eli Zaretskii

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.
parent 3a1f92d0
......@@ -1032,7 +1032,7 @@ Entry to this mode runs the hooks on `term-mode-hook'."
(setq indent-tabs-mode nil)
(setq buffer-display-table term-display-table)
(set (make-local-variable 'term-home-marker) (copy-marker 0))
(set (make-local-variable 'term-height) (window-text-height))
(set (make-local-variable 'term-height) (floor (window-screen-lines)))
(set (make-local-variable 'term-width) (window-max-chars-per-line))
(set (make-local-variable 'term-last-input-start) (make-marker))
(set (make-local-variable 'term-last-input-end) (make-marker))
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment