emacs-27 bd991e3: Fix frame-inner-height in non-GUI builds

[Basil L. Contovounesios]

branch: emacs-27
commit bd991e3c9bc9c26e641036f52adf82e052d4319c
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    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 <eliz@gnu.org>.
    
    * lisp/frame.el (frame-inner-height): Don't assume tab-bar-height is
    defined in builds --without-x.
---
 lisp/frame.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/frame.el b/lisp/frame.el
index 15e46c9..b7fd71e 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)