master 048dc94: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 048dc9441e77e5147ddf3c2ab64ddc3ba6fa0f3a
Merge: 35182ff 30e5d93
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    30e5d93ee1 (origin/emacs-27) Improve documentation of display tables
    8804ac857b * src/buffer.c (syms_of_buffer) <ctl-arrow>: Doc fix.  (Bu...
---
 doc/lispref/display.texi | 5 +++--
 src/buffer.c             | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 228c940..2ed03f6 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -7615,7 +7615,7 @@ Chars}.
   The above display conventions apply even when there is a display
 table, for any character whose entry in the active display table is
 @code{nil}.  Thus, when you set up a display table, you need only
-specify the characters for which you want special behavior.
+specify the characters for which you want special display behavior.
 
   The following variables affect how certain characters are displayed
 on the screen.  Since they change the number of columns the characters
@@ -7649,7 +7649,8 @@ command @code{tab-to-tab-stop}.  @xref{Indent Tabs}.
 (@pxref{Char-Tables}), with @code{display-table} as its subtype, which
 is used to override the usual character display conventions.  This
 section describes how to make, inspect, and assign elements to a
-display table object.
+display table object.  The next section (@pxref{Active Display Table})
+describes the various standard display tables and their precedence.
 
 @defun make-display-table
 This creates and returns a display table.  The table initially has
diff --git a/src/buffer.c b/src/buffer.c
index df302db..565577e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5681,10 +5681,10 @@ inserts one or more TAB characters, this variable will 
affect the
 indentation step as well, even if `indent-tabs-mode' is non-nil.  */);
 
   DEFVAR_PER_BUFFER ("ctl-arrow", &BVAR (current_buffer, ctl_arrow), Qnil,
-                    doc: /* Non-nil means display control chars with uparrow.
-A value of nil means use backslash and octal digits.
-This variable does not apply to characters whose display is specified
-in the current display table (if there is one).  */);
+                    doc: /* Non-nil means display control chars with uparrow 
`^'.
+A value of nil means use backslash `\\' and octal digits.
+This variable does not apply to characters whose display is specified in
+the current display table (if there is one; see `standard-display-table').  
*/);
 
   DEFVAR_PER_BUFFER ("enable-multibyte-characters",
                     &BVAR (current_buffer, enable_multibyte_characters),