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

5 files changed, 12 insertions, 9 deletions

diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi
index 4a316a1bddb..2df6c15c4ca 100644
--- a/doc/lispref/syntax.texi
+++ b/doc/lispref/syntax.texi
@@ -573,10 +573,11 @@ and by Font Lock mode during syntactic fontification (@pxref{Syntactic
 Font Lock}).  It is called with two arguments, @var{start} and
 @var{end}, which are the starting and ending positions of the text on
 which it should act.  It is allowed to call @code{syntax-ppss} on any
-position before @var{end}, but if it calls @code{syntax-ppss} on some
-position and later modifies the buffer on some earlier position,
-then it is its responsibility to call @code{syntax-ppss-flush-cache}
-to flush the now obsolete info from the cache.
+position before @var{end}, but if a Lisp program calls
+@code{syntax-ppss} on some position and later modifies the buffer at
+some earlier position, then it is that program's responsibility to
+call @code{syntax-ppss-flush-cache} to flush the now obsolete info
+from the cache.
 
 @strong{Caution:} When this variable is non-@code{nil}, Emacs removes
 @code{syntax-table} text properties arbitrarily and relies on
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 27fdb723441..c0a4a6dda06 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -343,7 +343,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 					    (const :tag "Never" nil)
 					    (const :tag "Always" t)
 					    (repeat (symbol :tag "Parameter")))
-					   "25.1")
+					   "27.1")
 	     (iconify-child-frame frames
 				  (choice
 				   (const :tag "Do nothing" nil)
diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index 7fbf0c42be7..5914ee4a202 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -354,9 +354,9 @@ INC may be passed as a numeric prefix argument.
 The actual adjustment made depends on the final component of the
 key-binding used to invoke the command, with all modifiers removed:
 
-   +, =   Increase the default face height by one step
-   -      Decrease the default face height by one step
-   0      Reset the default face height to the global default
+   +, =   Increase the height of the default face by one step
+   -      Decrease the height of the default face by one step
+   0      Reset the height of the default face to the global default
 
 After adjusting, continue to read input events and further adjust
 the face height as long as the input event read
diff --git a/lisp/frame.el b/lisp/frame.el
index 06aab269ddd..ce4de83b8c5 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -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)
diff --git a/lisp/indent.el b/lisp/indent.el
index 4a5550786d5..5cbf0acaa25 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -250,7 +250,8 @@ It is activated by calling `indent-rigidly' interactively.")
 If called interactively with no prefix argument, activate a
 transient mode in which the indentation can be adjusted interactively
 by typing \\<indent-rigidly-map>\\[indent-rigidly-left], \\[indent-rigidly-right], \\[indent-rigidly-left-to-tab-stop], or \\[indent-rigidly-right-to-tab-stop].
-Typing any other key exits this mode.  If `transient-mark-mode' is enabled,
+Typing any other key exits this mode, and this key is then
+acted upon as normally.  If `transient-mark-mode' is enabled,
 exiting also deactivates the mark.
 
 If called from a program, or interactively with prefix ARG,