procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-27

Browse source 
deef5efafb ; * ChangeLog.3: Update with the log of the last change.
bd991e3c9b Fix frame-inner-height in non-GUI builds
This commit is contained in:
Paul Eggert 2021-03-25 08:26:34 -07:00
commit b702225619
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog.3
View file

@ -2,6 +2,20 @@
* Version 27.2 released.
2021-03-18 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.
2021-03-18 Eli Zaretskii <eliz@gnu.org>
* etc/HISTORY: Update for Emacs 27.2.

2
lisp/frame.el
View file

@ -1370,7 +1370,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)