From bd991e3c9bc9c26e641036f52adf82e052d4319c Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Thu, 18 Mar 2021 21:39:05 +0000 Subject: [PATCH 1/2] 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. --- lisp/frame.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From deef5efafb70f4b171265b896505b92b6eef24e6 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 19 Mar 2021 03:16:54 -0400 Subject: [PATCH 2/2] ; * ChangeLog.3: Update with the log of the last change. --- ChangeLog.3 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ChangeLog.3 b/ChangeLog.3 index ccc06b85f75..27537de4cfa 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -2,6 +2,20 @@ * Version 27.2 released. +2021-03-18 Basil L. Contovounesios + + 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. + 2021-03-18 Eli Zaretskii * etc/HISTORY: Update for Emacs 27.2.