Merge from origin/emacs-27

8ad48a0bdd (origin/emacs-27) Improve doc string of 'text-scale-adjust'
7a25ff767d Clarify the indent-rigidly doc string
6c5ddf0e0b Fix two small tab bar issues
c71e08eba9 Fix last change in syntax.texi

# Conflicts:
#	lisp/indent.el
This commit is contained in:
Glenn Morris 2021-02-06 08:10:38 -08:00
commit c0d504eb7e
5 changed files with 12 additions and 9 deletions

View file

@ -1370,6 +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)
(* 2 (frame-internal-border-width frame))))
(defun frame-outer-width (&optional frame)