From: Glenn Morris <rgm@gnu.org>
Date: Sat, 6 Feb 2021 16:10:38 +0000 (-0800)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~3906
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c0d504eb7e0922be9f9ec6d9b7f1a27c5fc31b33;p=emacs.git

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
---

c0d504eb7e0922be9f9ec6d9b7f1a27c5fc31b33
diff --cc lisp/indent.el
index 4a5550786d5,ed67e1c16f7..5cbf0acaa25
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@@ -250,8 -212,8 +250,9 @@@ It is activated by calling `indent-rigi
  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 deactivates the transient mode, and this key is then
 -acted upon as normally.
++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,
  indent all lines starting in the region forward by ARG columns.