diff options
| author | Basil L. Contovounesios <contovob@tcd.ie> | 2021-03-18 21:39:05 +0000 |
|---|---|---|
| committer | Basil L. Contovounesios <contovob@tcd.ie> | 2021-03-18 22:13:05 +0000 |
| commit | bd991e3c9bc9c26e641036f52adf82e052d4319c (patch) | |
| tree | 4dd1ef66cd881268af25baa84e5df494ede7dbbe | |
| parent | d5b160d7cc1d067198b4f691eeae342952e4b097 (diff) | |
| download | emacs-bd991e3c9bc9c26e641036f52adf82e052d4319c.tar.gz | |
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.
| -rw-r--r-- | lisp/frame.el | 2 |
1 files changed, 1 insertions, 1 deletions
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) |