Minor clarifications.

(Display): Rearrange menu.
(Standard Faces): Mention query-replace face.
(Faces): Simplify.
(Font Lock): Simplify face customization info.
(Highlight Changes): Node merged into Highlight Interactively.
(Highlight Interactively): Much rewriting and cleanup.
(Optional Mode Line): Narrowed line number not good for goto-line.
Simplify face customization advice.
(Text Display): Mention use of escape-glyph face.
Move ctl-arrow and tab-width here.
(Display Custom): Move no-redraw-on-reenter to end of node.

1 files changed, 169 insertions, 193 deletions

diff --git a/man/display.texi b/man/display.texi
index 233a3f62021..9fee37afdc1 100644
--- a/man/display.texi
+++ b/man/display.texi
@@ -11,16 +11,15 @@ allow you to specify which part of the text you want to see, and how to
 display it.
 
 @menu
+* Scrolling::	           Moving text up and down in a window.
+* Horizontal Scrolling::   Moving text left and right in a window.
+* Follow Mode::            Follow mode lets two windows scroll as one.
 * Faces::	           How to change the display style using faces.
 * Standard Faces::         Emacs' predefined faces.
 * Font Lock::              Minor mode for syntactic highlighting using faces.
 * Highlight Interactively:: Tell Emacs what text to highlight.
-* Highlight Changes::      Using colors to show where you changed the buffer.
-* Scrolling::	           Moving text up and down in a window.
-* Horizontal Scrolling::   Moving text left and right in a window.
 * Fringes::                Enabling or disabling window fringes.
 * Useless Whitespace::     Showing possibly-spurious trailing whitespace.
-* Follow Mode::            Follow mode lets two windows scroll as one.
 * Selective Display::      Hiding lines with lots of indentation.
 * Optional Mode Line::     Optional mode line display features.
 * Text Display::           How text characters are normally displayed.
@@ -39,26 +38,18 @@ characters, the foreground and background color, and underlining or
 overlining.  A face does not have to specify all of these attributes;
 often it inherits most of them from another face.
 
-  On a window system, all the Emacs face attributes are meaningful.
-On a character terminal, only some of them work.  Some character
+  On graphical display, all the Emacs face attributes are meaningful.
+On a text-only terminal, only some of them work.  Some text-only
 terminals support inverse video, bold, and underline attributes; some
-support colors.  Character terminals generally do not support changing
+support colors.  Text-only terminals generally do not support changing
 the height and width or the font family.
 
-  The easiest way to use faces is to turn on Font Lock mode.
-@xref{Font Lock}, for more information about Font Lock mode and
-syntactic highlighting.  You can print out the buffer with the
-highlighting that appears on your screen using the command
+  Emacs uses faces automatically for highlighting, through the work of
+Font Lock mode.  @xref{Font Lock}, for more information about Font
+Lock mode and syntactic highlighting.  You can print out the buffer
+with the highlighting that appears on your screen using the command
 @code{ps-print-buffer-with-faces}.  @xref{PostScript}.
 
-  Features which rely on text in multiple faces (such as Font Lock mode)
-will also work on non-windowed terminals that can display more than one
-face, whether by colors or underlining and emboldening.  This includes
-the console on GNU/Linux, an @code{xterm} which supports colors, the
-MS-DOS display (@pxref{MS-DOS}), and the MS-Windows version invoked with
-the @option{-nw} option.  Emacs determines automatically whether the
-terminal has this capability.
-
   You control the appearance of a part of the text in the buffer by
 specifying the face or faces to use for it.  The style of display used
 for any given character is determined by combining the attributes of
@@ -106,12 +97,12 @@ type @kbd{M-x list-faces-display}.  It's possible for a given face to
 look different in different frames; this command shows the appearance
 in the frame in which you type it.
 
-Here are the standard faces for specifying text appearance.  You can
-use them on specific text, when you want the effects they produce.
+  Here are the standard faces for specifying text appearance.  You can
+apply them to specific text when you want the effects they produce.
 
 @table @code
 @item default
-This face is used for ordinary text that doesn't specify any other face.
+This face is used for ordinary text that doesn't specify any face.
 @item bold
 This face uses a bold variant of the default font, if it has one.
 It's up to you to choose a default font that has a bold variant,
@@ -126,7 +117,7 @@ This face underlines text.
 This face forces use of a particular fixed-width font.
 @item variable-pitch
 This face forces use of a particular variable-width font.  It's
-reasonable to customize this to use a different variable-width font,
+reasonable to customize this face to use a different variable-width font,
 if you like, but you should not make it a fixed-width font.
 @item shadow
 This face is used for making the text less noticeable than the surrounding
@@ -143,7 +134,9 @@ their own faces for this purpose.)
 This face is used for highlighting portions of text, in various modes.
 For example, mouse-sensitive text is highlighted using this face.
 @item isearch
-This face is used for highlighting Isearch matches.
+This face is used for highlighting the current Isearch match.
+@item query-replace
+This face is used for highlighting the current Query Replace match.
 @item lazy-highlight
 This face is used for lazy highlighting of Isearch and Query Replace
 matches other than the current one.
@@ -182,7 +175,7 @@ appearance of these parts of the frame.
 @itemx modeline
 This face is used for the mode line of the currently selected window,
 and for menu bars when toolkit menus are not used.  By default, it's
-drawn with shadows for a ``raised'' effect on window systems, and
+drawn with shadows for a ``raised'' effect on graphical displays, and
 drawn as the inverse of the default face on non-windowed terminals.
 @code{modeline} is an alias for the @code{mode-line} face, for
 compatibility with old Emacs versions.
@@ -196,12 +189,14 @@ Like @code{highlight}, but used for portions of text on mode lines.
 @item mode-line-buffer-id
 This face is used for buffer identification parts in the mode line.
 @item header-line
-Similar to @code{mode-line} for a window's header line.  Most modes
-don't use the header line, but some special modes, such the Info mode, do.
+Similar to @code{mode-line} for a window's header line, which appears
+at the top of a window just as the mode line appears at the bottom.
+Most windows do not have a header line---only some special modes, such
+Info mode, create one.
 @item vertical-border
 This face is used for the vertical divider between windows.
 By default this face inherits from the @code{mode-line-inactive} face
-on character terminals.  On window systems the foreground color of
+on character terminals.  On graphical displays the foreground color of
 this face is used for the vertical line between windows without
 scrollbars.
 @item minibuffer-prompt
@@ -227,8 +222,7 @@ This face determines the color of the cursor.
 @item mouse
 This face determines the color of the mouse pointer.
 @item tool-bar
-This is the basic tool-bar face.  No text appears in the tool bar, but the
-colors of this face affect the appearance of tool bar icons.  @xref{Tool Bars}.
+This face determines the color of tool bar icons.  @xref{Tool Bars}.
 @item tooltip
 This face is used for tooltips.  @xref{Tooltips}.
 @item menu
@@ -277,8 +271,8 @@ interface (@pxref{Easy Customization}), or use the function
 @end example
 
 @findex turn-on-font-lock
-  If you have disabled Global Font Lock mode, you can still enable font
-lock for specific major modes by adding the function
+  If you have disabled Global Font Lock mode, you can still enable Font
+Lock for specific major modes by adding the function
 @code{turn-on-font-lock} to the mode hooks (@pxref{Hooks}).  For
 example, to enable Font Lock mode for editing C files, you can do this:
 
@@ -288,24 +282,13 @@ example, to enable Font Lock mode for editing C files, you can do this:
 
   Font Lock mode uses several specifically named faces to do its job,
 including @code{font-lock-string-face}, @code{font-lock-comment-face},
-and others.  The easiest way to find them all is to use
-@kbd{M-x customize-group @key{RET} font-lock-faces @key{RET}}.
-
-  To change the colors or the fonts used by Font Lock mode to fontify
-different parts of text, just change these faces.  There are
-two ways to do it:
-
-@itemize @bullet
-@item
-Invoke @kbd{M-x set-face-foreground} or @kbd{M-x set-face-background}
-to change the colors of a particular face used by Font Lock.
-@xref{Faces}.  The command @kbd{M-x list-faces-display} displays all
-the faces currently known to Emacs, including those used by Font Lock.
+and others.  The easiest way to find them all is to use @kbd{M-x
+customize-group @key{RET} font-lock-faces @key{RET}}.  You can then
+use that customization buffer to customize the appearance of these
+faces.  @xref{Face Customization}.
 
-@item
-Customize the faces interactively with @kbd{M-x customize-face}, as
-described in @ref{Face Customization}.
-@end itemize
+  You can also customize these faces using @kbd{M-x
+set-face-foreground} or @kbd{M-x set-face-background}.  @xref{Faces}.
 
 @vindex font-lock-maximum-decoration
   The variable @code{font-lock-maximum-decoration} specifies the
@@ -324,8 +307,9 @@ otherwise, use this:
 
 @vindex font-lock-maximum-size
   Fontification can be too slow for large buffers, so you can suppress
-it.  The variable @code{font-lock-maximum-size} specifies a buffer size,
-beyond which buffer fontification is suppressed.
+it for buffers above a certain size.  The variable
+@code{font-lock-maximum-size} specifies a buffer size, beyond which
+buffer fontification is suppressed.
 
 @c @w is used below to prevent a bad page-break.
 @vindex font-lock-beginning-of-syntax-function
@@ -387,52 +371,62 @@ control this background fontification, also called @dfn{Just-In-Time}
 group @samp{jit-lock}.  @xref{Specific Customization}.
 
 @node Highlight Interactively
-@section Interactive Highlighting by Matching
+@section Interactive Highlighting
 @cindex highlighting by matching
 @cindex interactive highlighting
+@cindex Highlight Changes mode
 
-  It is sometimes useful to temporarily highlight text that
-matches a certain regular expression.  For example, you might wish to
-see all the references to a certain variable in a program source file,
-highlight certain parts in a voluminous output of some program, or
-make certain names stand out in an article.
+@findex highlight-changes-mode
+  Use @kbd{M-x highlight-changes-mode} to enable (or disable)
+Highlight Changes mode, a minor mode that uses faces (colors,
+typically) to indicate which parts of the buffer were changed most
+recently.
 
+@cindex Hi Lock mode
 @findex hi-lock-mode
-  Use the @kbd{M-x hi-lock-mode} command to turn on a minor mode that
-allows you to interactively add and remove regular expressions
-specifying text to be highlighted.  Hi Lock mode works like Font Lock
-mode (@pxref{Font Lock}), except that it lets you easily add and
-remove regular expressions while you are editing a buffer.  To enable
-Hi Lock mode for all buffers use @kbd{M-x global-hi-lock-mode} or
-place @code{(global-hi-lock-mode 1)} in your @file{.emacs} file.
-
-You control Hi Lock mode with these commands:
+  Hi Lock mode is another minor mode, which highlights text that
+matches your specified regular expressions.  For example, you might
+wish to see all the references to a certain variable in a program
+source file, highlight certain parts in a voluminous output of some
+program, or make certain names stand out in an article.  Use the
+@kbd{M-x hi-lock-mode} command to enable (or disable) Hi Lock mode.
+To enable Hi Lock mode for all buffers, use @kbd{M-x
+global-hi-lock-mode} or place @code{(global-hi-lock-mode 1)} in your
+@file{.emacs} file.
+
+  Hi Lock mode works like Font Lock mode (@pxref{Font Lock}), except
+that you specify explicitly the regular expressions to highlight.  You
+control them with these commands:
 
 @table @kbd
 @item C-x w h @var{regexp} @key{RET} @var{face} @key{RET}
 @kindex C-x w h
 @findex highlight-regexp
 Highlight text that matches @var{regexp} using face @var{face}
-(@code{highlight-regexp}).  By using this command more than once, you
-can highlight various parts of the text in different ways.  The
-highlighting will remain as long as the buffer is loaded.  For
-example, to highlight all occurrences of the word ``whim'' using the
-default face (a yellow background) @kbd{C-x w h whim @key{RET}
-@key{RET}}.  Any face can be used for highlighting, Hi Lock provides
-several of its own and these are pre-loaded into a history list.  While
-being prompted for a face use @kbd{M-p} and @kbd{M-n} to cycle through
-them.
+(@code{highlight-regexp}).  The highlighting will remain as long as
+the buffer is loaded.  For example, to highlight all occurrences of
+the word ``whim'' using the default face (a yellow background)
+@kbd{C-x w h whim @key{RET} @key{RET}}.  Any face can be used for
+highlighting, Hi Lock provides several of its own and these are
+pre-loaded into a history list.  While being prompted for a face use
+@kbd{M-p} and @kbd{M-n} to cycle through them.
+
+You can use this command multiple times, specifying various regular
+expressions to highlight in different ways.
 
 @item C-x w r @var{regexp} @key{RET}
 @kindex C-x w r
 @findex unhighlight-regexp
 Unhighlight @var{regexp} (@code{unhighlight-regexp}).
-When activated from the menu select the expression to unhighlight from
-a list.  When activated from the keyboard the most recently added
-expression will be shown.  Use @kbd{M-p} to show the next older
-expression and @kbd{M-n} to select the next newer expression.  When
-the expression to unhighlight appears press @kbd{@key{RET}} to unhighlight
-it.  The expression can also be typed and completion is available.
+
+If you invoke this from the menu, you select the expression to
+unhighlight from a list.  If you invoke this from the keyboard, you
+use the minibuffer.  It will show the most recently added regular
+expression; use @kbd{M-p} to show the next older expression and
+@kbd{M-n} to select the next newer expression.  (You can also type the
+expression by hand, with completion.)  When the expression you want to
+unhighlight appears in the minibuffer, press @kbd{@key{RET}} to exit
+the minibuffer and unhighlight it.
 
 @item C-x w l @var{regexp} @key{RET} @var{face} @key{RET}
 @kindex C-x w l
@@ -447,8 +441,8 @@ Highlight entire lines containing a match for @var{regexp}, using face
 @findex hi-lock-write-interactive-patterns
 Insert all the current highlighting regexp/face pairs into the buffer
 at point, with comment delimiters to prevent them from changing your
-program.  This key binding runs the
-@code{hi-lock-write-interactive-patterns} command.
+program.  (This key binding runs the
+@code{hi-lock-write-interactive-patterns} command.)
 
 These patterns will be read the next time you visit the file while
 Hi Lock mode is enabled, or whenever you use the @kbd{M-x
@@ -472,14 +466,6 @@ This command does nothing if the major mode is a member of the list
 @code{hi-lock-exclude-modes}.
 @end table
 
-@node Highlight Changes
-@section Highlight Changes Mode
-
-@findex highlight-changes-mode
-  Use @kbd{M-x highlight-changes-mode} to enable a minor mode
-that uses faces (colors, typically) to indicate which parts of
-the buffer were changed most recently.
-
 @node Scrolling
 @section Scrolling
 
@@ -489,12 +475,13 @@ the text.  The portion shown always contains point.
 
 @cindex scrolling
   @dfn{Scrolling} means moving text up or down in the window so that
-different parts of the text are visible.  Scrolling forward means that text
-moves up, and new text appears at the bottom.  Scrolling backward moves
-text down and new text appears at the top.
+different parts of the text are visible.  Scrolling ``forward'' or
+``up'' means that text moves up, and new text appears at the bottom.
+Scrolling ``backward'' or ``down'' moves text down, and new text
+appears at the top.
 
-  Scrolling happens automatically if you move point past the bottom or top
-of the window.  You can also explicitly request scrolling with the commands
+  Scrolling happens automatically if you move point past the bottom or
+top of the window.  You can also scroll explicitly with the commands
 in this section.
 
 @table @kbd
@@ -733,7 +720,9 @@ for the selected frame, use @kbd{M-x set-fringe-style}.
   It is easy to leave unnecessary spaces at the end of a line, or
 empty lines at the end of a file, without realizing it.  In most
 cases, this @dfn{trailing whitespace} has no effect, but there are
-special circumstances where it matters.
+special circumstances where it matters.  It can also be a nuisance
+that the line has ``changed,'' when the change is just spaces added or
+removed at the end.
 
   You can make trailing whitespace at the end of a line visible on the
 screen by setting the buffer-local variable
@@ -768,7 +757,7 @@ this image in the fringe.
 value of this variable is controlled by the variable
 @code{default-indicate-empty-lines}; by setting that variable, you
 can enable or disable this feature for all new buffers.  (This feature
-currently doesn't work on character terminals.)
+currently doesn't work on text-only terminals.)
 
 @node Follow Mode
 @section Follow Mode
@@ -868,6 +857,9 @@ minor modes and about how to use this command.
 @cindex narrowing, and line number display
   If you have narrowed the buffer (@pxref{Narrowing}), the displayed
 line number is relative to the accessible portion of the buffer.
+Thus, it isn't suitable as an argument to @code{goto-line}.  (Use
+@code{what-line} command to see the line number relative to the whole
+file.)
 
 @vindex line-number-display-limit
   If the buffer is very large (larger than the value of
@@ -933,19 +925,7 @@ file in the directory is considered as ``newly arrived mail'').
 3D-style highlighting, like that of a button when it is not being
 pressed.  If you don't like this effect, you can disable the 3D
 highlighting of the mode line, by customizing the attributes of the
-@code{mode-line} face in your @file{.emacs} init file, like this:
-
-@example
-(set-face-attribute 'mode-line nil :box nil)
-@end example
-
-@noindent
-Alternatively, you can turn off the box attribute in your
-@file{.Xdefaults} file:
-
-@example
-Emacs.mode-line.AttributeBox: off
-@end example
+@code{mode-line} face.  @xref{Face Customization}.
 
 @cindex non-selected windows, mode line appearance
   By default, the mode line of nonselected windows is displayed in a
@@ -968,8 +948,7 @@ lines are displayed in the @code{mode-line} face.
   You can customize the mode line display for each of the end-of-line
 formats by setting each of the variables @code{eol-mnemonic-unix},
 @code{eol-mnemonic-dos}, @code{eol-mnemonic-mac}, and
-@code{eol-mnemonic-undecided} to any string you find appropriate.
-@xref{Variables}, for an explanation of how to set variables.
+@code{eol-mnemonic-undecided} to the strings you prefer.
 
 @node Text Display
 @section How Text Is Displayed
@@ -986,17 +965,27 @@ tab stop column (normally every 8 columns).
 
   Other @acronym{ASCII} control characters are normally displayed as a caret
 (@samp{^}) followed by the non-control version of the character; thus,
-control-A is displayed as @samp{^A}.
-
-  Non-@acronym{ASCII} characters 0200 through 0237 (octal) are displayed with
-octal escape sequences; thus, character code 0230 (octal) is displayed
-as @samp{\230}.  The display of character codes 0240 through 0377
-(octal) may be either as escape sequences or as graphics.  They do not
-normally occur in multibyte buffers, but if they do, they are displayed
-as Latin-1 graphics.  In unibyte mode, if you enable European display
-they are displayed using their graphics (assuming your terminal supports
-them), otherwise as escape sequences.  @xref{Single-Byte Character
-Support}.
+control-A is displayed as @samp{^A}.  The caret appears in face
+@code{escape-glyph}.
+
+  Non-@acronym{ASCII} characters 0200 through 0237 (octal) are
+displayed with octal escape sequences; thus, character code 0230
+(octal) is displayed as @samp{\230}.  The backslash appears in face
+@code{escape-glyph}.
+
+@vindex ctl-arrow
+  If the variable @code{ctl-arrow} is @code{nil}, control characters in
+the buffer are displayed with octal escape sequences, except for newline
+and tab.  Altering the value of @code{ctl-arrow} makes it local to the
+current buffer; until that time, the default value is in effect.  The
+default is initially @code{t}.
+
+  The display of character codes 0240 through 0377 (octal) may be
+either as escape sequences or as graphics.  They do not normally occur
+in multibyte buffers, but if they do, they are displayed as Latin-1
+graphics.  In unibyte mode, if you enable European display they are
+displayed using their graphics (assuming your terminal supports them),
+otherwise as escape sequences.  @xref{Single-Byte Character Support}.
 
 @vindex nobreak-char-display
 @cindex no-break space, display
@@ -1011,6 +1000,23 @@ this feature by setting the variable @code{nobreak-char-display} to
 @code{nil}.  If you set the variable to any other value, that means to
 prefix these characters with an escape character.
 
+@vindex tab-width
+@vindex default-tab-width
+  Normally, a tab character in the buffer is displayed as whitespace which
+extends to the next display tab stop position, and display tab stops come
+at intervals equal to eight spaces.  The number of spaces per tab is
+controlled by the variable @code{tab-width}, which is made local by
+changing it.  Note that how the tab character
+in the buffer is displayed has nothing to do with the definition of
+@key{TAB} as a command.  The variable @code{tab-width} must have an
+integer value between 1 and 1000, inclusive.  The variable
+@code{default-tab-width} controls the default value of this variable
+for buffers where you have not set it locally.
+
+  You can customize the way any particular character code is displayed
+by means of a display table.  @xref{Display Tables,, Display Tables,
+elisp, The Emacs Lisp Reference Manual}.
+
 @node Cursor Display
 @section Displaying the Cursor
 
@@ -1053,8 +1059,8 @@ tab character.  To enable this feature, set the variable
 @findex hl-line-mode
 @findex global-hl-line-mode
 @cindex highlight current line
-  If you find it hard to see the cursor, you might like HL Line mode,
-a minor mode that highlights the line containing point.  Use @kbd{M-x
+  To make the cursor even more visible, you can use HL Line mode, a
+minor mode that highlights the line containing point.  Use @kbd{M-x
 hl-line-mode} to enable or disable it in the current buffer.  @kbd{M-x
 global-hl-line-mode} enables or disables the same mode globally.
 
@@ -1062,7 +1068,7 @@ global-hl-line-mode} enables or disables the same mode globally.
 @section Customization of Display
 
   This section describes variables (@pxref{Variables}) that you can
-change to customize how Emacs displays text.  Beginning users can skip
+change to customize how Emacs displays.  Beginning users can skip
 it.
 @c the reason for that pxref is because an xref early in the
 @c ``echo area'' section leads here.
@@ -1077,51 +1083,18 @@ to make the whole screen blink when it would normally make an audible bell
 sound.  This variable has no effect if your terminal does not have a way
 to make the screen blink.
 
-@vindex no-redraw-on-reenter
-  On a text terminal, when you reenter Emacs after suspending, Emacs
-normally clears the screen and redraws the entire display.  On some
-terminals with more than one page of memory, it is possible to arrange
-the termcap entry so that the @samp{ti} and @samp{te} strings (output
-to the terminal when Emacs is entered and exited, respectively) switch
-between pages of memory so as to use one page for Emacs and another
-page for other output.  Then you might want to set the variable
-@code{no-redraw-on-reenter} non-@code{nil}; this tells Emacs to
-assume, when resumed, that the screen page it is using still contains
-what Emacs last wrote there.
-
 @vindex echo-keystrokes
   The variable @code{echo-keystrokes} controls the echoing of multi-character
 keys; its value is the number of seconds of pause required to cause echoing
-to start, or zero meaning don't echo at all.  @xref{Echo Area}.
-
-@vindex ctl-arrow
-  If the variable @code{ctl-arrow} is @code{nil}, all control characters in
-the buffer are displayed with octal escape sequences, except for newline
-and tab.  Altering the value of @code{ctl-arrow} makes it local to the
-current buffer; until that time, the default value is in effect.  The
-default is initially @code{t}.  @xref{Display Tables,, Display Tables,
-elisp, The Emacs Lisp Reference Manual}.
-
-@vindex tab-width
-@vindex default-tab-width
-  Normally, a tab character in the buffer is displayed as whitespace which
-extends to the next display tab stop position, and display tab stops come
-at intervals equal to eight spaces.  The number of spaces per tab is
-controlled by the variable @code{tab-width}, which is made local by
-changing it, just like @code{ctl-arrow}.  Note that how the tab character
-in the buffer is displayed has nothing to do with the definition of
-@key{TAB} as a command.  The variable @code{tab-width} must have an
-integer value between 1 and 1000, inclusive.  The variable
-@code{default-tab-width} controls the default value of this variable
-for buffers where you have not set it locally.
+to start, or zero, meaning don't echo at all.  @xref{Echo Area}.
 
 @cindex truncation
 @cindex line truncation, and fringes
   As an alternative to continuation, Emacs can display long lines by
 @dfn{truncation}.  This means that all the characters that do not fit
 in the width of the screen or window do not appear at all.  On
-graphical terminals, a small straight arrow in the fringe indicates
-truncation at either end of the line.  On text terminals, @samp{$}
+graphical displays, a small straight arrow in the fringe indicates
+truncation at either end of the line.  On text-only terminals, @samp{$}
 appears in the first column when there is text truncated to the left,
 and in the last column when there is text truncated to the right.
 
@@ -1147,27 +1120,22 @@ elisp, The Emacs Lisp Reference Manual}.
 
 @vindex overflow-newline-into-fringe
   If the variable @code{overflow-newline-into-fringe} is
-non-@code{nil} on a window system, it specifies that lines which are
-exactly as wide as the window (not counting the final newline
-character) shall not be broken into two lines on the display (with
-just the newline on the second line).  Instead, the newline
-overflows into the right fringe, and the cursor will be displayed in
-the fringe when positioned on that newline.
+non-@code{nil} on a graphical display, then Emacs does not continue or
+truncate a line which is exactly as wide as the window.  Instead, the
+newline overflows into the right fringe, and the cursor appears in the
+fringe when positioned on that newline.
 
 @vindex indicate-buffer-boundaries
-  On a window system, Emacs may indicate the buffer boundaries in the
-fringes.  The buffer boundaries, i.e. first and last line in the
-buffer, can be marked with angle bitmaps in the left or right fringe.
-This can be combined with up and down arrow bitmaps shown at the top
-and bottom of the left or right fringe if the window can be scrolled
-in either direction.
+  On a graphical display, Emacs can indicate the buffer boundaries in
+the fringes.  It inddicates the first line and the last line with
+angle images in the fringes.  This can be combined with up and down
+arrow images which say whether it is possible to scroll the window up
+and down.
 
   The buffer-local variable @code{indicate-buffer-boundaries} controls
 how the buffer boundaries and window scrolling is indicated in the
-fringes.
-
-  If the value is @code{left} or @code{right}, both angle and arrow
-bitmaps are displayed in the left or right fringe, respectively.
+fringes.  If the value is @code{left} or @code{right}, both angle and
+arrow bitmaps are displayed in the left or right fringe, respectively.
 
   If value is an alist, each element @code{(@var{indicator} .
 @var{position})} specifies the position of one of the indicators.
@@ -1189,25 +1157,21 @@ is the default value for @code{indicate-buffer-boundaries} in buffers
 that do not override it.
 
 @vindex baud-rate
-  The variable @anchor{baud-rate}@code{baud-rate} holds the output speed of the
-terminal, as far as Emacs knows.  Setting this variable does not
-change the speed of actual data transmission, but the value is used
-for calculations.  On terminals, it affects padding, and decisions
-about whether to scroll part of the screen or redraw it instead.
-It also affects the behavior of incremental search.
-
-  On window-systems, @code{baud-rate} is only used to determine how
-frequently to look for pending input during display updating.  A
+  The variable @anchor{baud-rate}@code{baud-rate} holds the output
+speed of the terminal, as far as Emacs knows.  Setting this variable
+does not change the speed of actual data transmission, but the value
+is used for calculations.  On text-only terminals, it affects padding,
+and decisions about whether to scroll part of the screen or redraw it
+instead.  It also affects the behavior of incremental search.
+
+  On graphical displays, @code{baud-rate} is only used to determine
+how frequently to look for pending input during display updating.  A
 higher value of @code{baud-rate} means that check for pending input
 will be done less frequently.
 
-  You can customize the way any particular character code is displayed
-by means of a display table.  @xref{Display Tables,, Display Tables,
-elisp, The Emacs Lisp Reference Manual}.
-
 @cindex hourglass pointer display
 @vindex hourglass-delay
-  On a window system, Emacs can optionally display the mouse pointer
+  On graphical display, Emacs can optionally display the mouse pointer
 in a special shape to say that Emacs is busy.  To turn this feature on
 or off, customize the group @code{cursor}.  You can also control the
 amount of time Emacs must remain busy before the busy indicator is
@@ -1219,6 +1183,18 @@ result in text that is hard to read.  Call the function
 @code{tty-suppress-bold-inverse-default-colors} with a non-@code{nil}
 argument to suppress the effect of bold-face in this case.
 
+@vindex no-redraw-on-reenter
+  On a text-only terminal, when you reenter Emacs after suspending, Emacs
+normally clears the screen and redraws the entire display.  On some
+terminals with more than one page of memory, it is possible to arrange
+the termcap entry so that the @samp{ti} and @samp{te} strings (output
+to the terminal when Emacs is entered and exited, respectively) switch
+between pages of memory so as to use one page for Emacs and another
+page for other output.  Then you might want to set the variable
+@code{no-redraw-on-reenter} non-@code{nil}; this tells Emacs to
+assume, when resumed, that the screen page it is using still contains
+what Emacs last wrote there.
+
 @ignore
    arch-tag: 2219f910-2ff0-4521-b059-1bd231a536c4
 @end ignore