Miscellaneous clarifications.

Info on customizing cursor moved to display.texi.

1 files changed, 32 insertions, 46 deletions

diff --git a/man/basic.texi b/man/basic.texi
index d741a8a16ef..1434348a981 100644
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -94,12 +94,12 @@ overwriting with it.)
 @cindex 8-bit character codes
 @noindent
 When multibyte characters are enabled, if you specify a code in the
-range 0200 through 0377 octal, @kbd{C-q} assumes that you intend to use
-some ISO 8859-@var{n} character set, and converts the specified code to
-the corresponding Emacs character code.  @xref{Enabling Multibyte}.  You
-select to @emph{which} of the ISO 8859 character sets should Emacs
-convert the 8-bit code through your choice of language environment
-(@pxref{Language Environments}).
+range 0200 through 0377 octal, @kbd{C-q} assumes that you intend to
+use some ISO 8859-@var{n} character set, and converts the specified
+code to the corresponding Emacs character code.  @xref{Enabling
+Multibyte}.  You select @emph{which} of the ISO 8859 character sets to
+use through your choice of language environment (@pxref{Language
+Environments}).
 
 @vindex read-quoted-char-radix
 To use decimal or hexadecimal instead of octal, set the variable
@@ -464,43 +464,41 @@ nonblank line.
 @cindex wrapping
 @cindex line wrapping
   If you add too many characters to one line without breaking it with
-@key{RET}, the line will grow to occupy two (or more) lines on the
-screen.  On terminals, one or more @samp{\} characters are displayed
-at the extreme right margin of all but the last of them.  The @samp{\}
-characters say that the following screen line is not really a distinct
-line in the text, but just the @dfn{continuation} of a line too long
-to fit the screen.  Continuation is also called @dfn{line wrapping}.
-More than one @samp{\} is displayed for a wrapped character which is
-wider than one column.  On window systems, small bitmaps are displayed
-in the fringes to the left and right of the window to indicate line
-wrapping.
+@key{RET}, the line grows to occupy two (or more) lines on the screen.
+On graphical displays, Emacs indicates line wrapping with small bent
+arrows in the fringes to the left and right of the window.  On
+text-only terminals, Emacs displays a @samp{\} character at the right
+margin of a screen line if it is not the last in its text line.  This
+@samp{\} character says that the following screen line is not really a
+distinct line in the text, just a @dfn{continuation} of a line too
+long to fit the screen.  Continuation is also called @dfn{line
+wrapping}.
+
+  When line wrapping occurs before a character that is wider than one
+column, some columns at the end of the previous screen line may be
+``empty.''  In this case, Emacs displays additional @samp{\}
+characters in the ``empty'' columns, just before the @samp{\}
+character that indicates continuation.
 
   Sometimes it is nice to have Emacs insert newlines automatically when
 a line gets too long.  Continuation on the screen does not do that.  Use
 Auto Fill mode (@pxref{Filling}) if that's what you want.
 
 @vindex truncate-lines
-@findex toggle-truncate-lines
 @cindex truncation
   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.  They
 remain in the buffer, temporarily invisible.  On terminals, @samp{$}
-is used in the last column instead of @samp{\} to inform you that
-truncation is in effect.  On window systems, a small bitmap in the
-fringe to the right of the window indicates line truncation.
+in the last column informs you that the line has been truncated on the
+display.  On window systems, a small straight arrow in the fringe to
+the right of the window indicates a truncated line.
 
+@findex toggle-truncate-lines
   Truncation instead of continuation happens whenever horizontal
 scrolling is in use, and optionally in all side-by-side windows
-(@pxref{Windows}).  You can enable truncation for a particular buffer by
-setting the variable @code{truncate-lines} to non-@code{nil} in that
-buffer.  (@xref{Variables}.)  Altering the value of
-@code{truncate-lines} makes it local to the current buffer; until that
-time, the default value is in effect.  The default is initially
-@code{nil}.  @xref{Locals}.
-
-  The command @kbd{M-x toggle-truncate-lines} toggles the display
-between continuation and truncation.
+(@pxref{Windows}).  You can enable or disable truncation for a
+particular buffer with the command @kbd{M-x toggle-truncate-lines}.
 
   @xref{Display Vars}, for additional variables that affect how text is
 displayed.
@@ -513,21 +511,21 @@ parts of the buffer, and to count lines.
 
 @table @kbd
 @item M-x what-page
-Print page number of point, and line number within page.
+Display the page number of point, and the line number within the page.
 @item M-x what-line
-Print line number of point in the buffer.
+Display the line number of point in the buffer.
 @item M-x line-number-mode
 @itemx M-x column-number-mode
 Toggle automatic display of current line number or column number.
 @xref{Optional Mode Line}.
 @item M-=
-Print number of lines in the current region (@code{count-lines-region}).
+Display the number of lines in the current region (@code{count-lines-region}).
 @xref{Mark}, for information about the region.
 @item C-x =
-Print character code of character after point, character position of
+Display the character code of character after point, character position of
 point, and column of point (@code{what-cursor-position}).
 @item M-x hl-line-mode
-Highlighting the current line.
+Enable or disable highlighting of the current line.
 @end table
 
 @findex what-page
@@ -627,18 +625,6 @@ as the actual glyph of A with grave accent.}:
 Char: @`A (04300, 2240, 0x8c0, ext ESC , A @@) (latin-iso8859-1 64)
 @end example
 
-@findex hl-line-mode
-@findex blink-cursor-mode
-@cindex cursor, locating visually
-@cindex cursor, blinking
-@kbd{M-x hl-line-mode} turns on a global minor mode which highlights the
-line about point in the selected window (on terminals which support
-highlighting).  Some people find this convenient.  If you find the
-cursor difficult to spot, you might try changing its color by
-customizing the @code{cursor} face or rely on (the default)
-@code{blink-cursor-mode}.  Cursor color and blinking can be conrolled
-via the @code{cursor} Custom group.
-
 @node Arguments
 @section Numeric Arguments
 @cindex numeric arguments