From: Basil L. Contovounesios Date: Thu, 18 Mar 2021 21:39:05 +0000 (+0000) Subject: Fix frame-inner-height in non-GUI builds X-Git-Tag: emacs-27.2-rc2~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bd991e3c9bc9c26e641036f52adf82e052d4319c;p=emacs.git Fix frame-inner-height in non-GUI builds Include tab bar in frame's inner height in non-GUI builds that don't define tab-bar-height. This is consistent with the inclusion of the menu bar in the calculated height. It is also consistent with TTY frames of GUI builds, for which tab-bar-height is always zero anyway (bug#47234). Fix suggested by Eli Zaretskii . * lisp/frame.el (frame-inner-height): Don't assume tab-bar-height is defined in builds --without-x. --- diff --git a/lisp/frame.el b/lisp/frame.el index 15e46c9e210..b7fd71e9053 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1344,7 +1344,7 @@ FRAME defaults to the selected frame." FRAME defaults to the selected frame." (setq frame (window-normalize-frame frame)) (- (frame-native-height frame) - (tab-bar-height frame t) + (if (fboundp 'tab-bar-height) (tab-bar-height frame t) 0) (* 2 (frame-internal-border-width frame)))) (defun frame-outer-width (&optional frame)