X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/015a26d79c29e0ae441d0f4543e3f55382d12ce2..231a33160ed418f73dea4f0972e469c8cdd64c13:/man/basic.texi

diff --git a/man/basic.texi b/man/basic.texi
index bd5b60f14c..f7eb39d31d 100644
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 2000 Free Software Foundation, Inc.
+@c Copyright (C) 1985,86,87,93,94,95,97,2000,2001 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Basic, Minibuffer, Exiting, Top
 @chapter Basic Editing Commands
@@ -60,7 +60,7 @@ be @key{DEL}, and sets it up that way.  But in some cases, especially
 with text-only terminals, you will need to tell Emacs which key to use
 for that purpose.  If the large key not far above the @key{RET} or
 @key{ENTER} key doesn't delete backwards, you need to do this.
-@xref{DEL Gets Help}, for an explanation of how.
+@xref{DEL Does Not Delete}, for an explanation of how.
 
   Most PC keyboards have both a @key{BACKSPACE} key a short ways above
 @key{RET} or @key{ENTER}, and a @key{DELETE} key elsewhere.  On these
@@ -334,7 +334,7 @@ where it was before the command that made the change.
   Consecutive repetitions of @kbd{C-_} or @kbd{C-x u} undo earlier and
 earlier changes, back to the limit of the undo information available.
 If all recorded changes have already been undone, the undo command
-prints an error message and does nothing.
+displays an error message and does nothing.
 
   Any command other than an undo command breaks the sequence of undo
 commands.  Starting from that moment, the previous undo commands become
@@ -465,7 +465,6 @@ a description of all the help facilities.  @xref{Help}.@refill
   Here are special commands and techniques for putting in and taking out
 blank lines.
 
-@c widecommands
 @table @kbd
 @item C-o
 Insert one or more blank lines after the cursor (@code{open-line}).
@@ -507,6 +506,7 @@ nonblank line.
 @cindex continuation line
 @cindex wrapping
 @cindex line wrapping
+@cindex fringes, and continuation lines
   If you add too many characters to one line without breaking it with
 @key{RET}, the line grows to occupy two (or more) lines on the screen.
 On graphical displays, Emacs indicates line wrapping with small bent
@@ -530,6 +530,7 @@ Auto Fill mode (@pxref{Filling}) if that's what you want.
 
 @vindex truncate-lines
 @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.  They
@@ -569,7 +570,8 @@ Display the number of lines in the current region (@code{count-lines-region}).
 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
-Enable or disable highlighting of the current line.
+Enable or disable highlighting of the current line.  @xref{Cursor
+Display}.
 @end table
 
 @findex what-page
@@ -591,20 +593,22 @@ is relative to the accessible portion (@pxref{Narrowing}).  By contrast,
 region and the line number relative to the whole buffer.
 
   @kbd{M-x what-page} counts pages from the beginning of the file, and
-counts lines within the page, printing both numbers.  @xref{Pages}.
+counts lines within the page, showing both numbers in the echo area.
+@xref{Pages}.
 
 @kindex M-=
 @findex count-lines-region
   While on this subject, we might as well mention @kbd{M-=} (@code{count-lines-region}),
-which prints the number of lines in the region (@pxref{Mark}).
+which displays the number of lines in the region (@pxref{Mark}).
 @xref{Pages}, for the command @kbd{C-x l} which counts the lines in the
 current page.
 
 @kindex C-x =
 @findex what-cursor-position
-  The command @kbd{C-x =} (@code{what-cursor-position}) can be used to find out
-the column that the cursor is in, and other miscellaneous information about
-point.  It prints a line in the echo area that looks like this:
+  The command @kbd{C-x =} (@code{what-cursor-position}) shows what
+column the cursor is in, and other miscellaneous information about
+point and the character after it.  It displays a line in the echo area
+that looks like this:
 
 @smallexample
 Char: c (0143, 99, 0x63)  point=21044 of 26883(78%)  column 53 
@@ -632,7 +636,7 @@ percentage of the total size.
 columns from the left edge of the window.
 
   If the buffer has been narrowed, making some of the text at the
-beginning and the end temporarily inaccessible, @kbd{C-x =} prints
+beginning and the end temporarily inaccessible, @kbd{C-x =} displays
 additional text describing the currently accessible range.  For example, it
 might display this:
 
@@ -650,22 +654,42 @@ part), the @w{@kbd{C-x =}} output does not describe a character after
 point.  The output might look like this:
 
 @smallexample
-point=26957 of 26956(100%)  column 0 
+point=26957 of 26956(100%)  column 0
 @end smallexample
 
-  @w{@kbd{C-u C-x =}} displays additional information about a character,
-in place of the buffer coordinates and column: the character set name
-and the codes that identify the character within that character set;
-ASCII characters are identified as belonging to the @code{ASCII}
-character set.  In addition, the full character encoding, even if it
-takes more than a single byte, is shown after @samp{ext}.  Here's an
-example for a Latin-1 character A with a grave accent in a buffer whose
-coding system is iso-2022-7bit@footnote{On terminals that support
-Latin-1 characters, the character shown after @samp{Char:} is displayed
-as the actual glyph of A with grave accent.}:
+@cindex character set of character at point
+@cindex font of character at point
+@cindex text properties at point
+  @w{@kbd{C-u C-x =}} displays additional information about a
+character, including the character set name and the codes that
+identify the character within that character set; ASCII characters are
+identified as belonging to the @code{ascii} character set.  It also
+shows the character's syntax, categories, and encodings both
+internally in the buffer and externally if you save the file.  It also
+shows the character's text properties (@pxref{Text Properties,,,
+elisp, the Emacs Lisp Reference Manual}), and any overlays containing it
+(@pxref{Overlays,,, elisp, the same manual}).
+
+  Here's an example showing the Latin-1 character A with grave accent,
+in a buffer whose coding system is @code{iso-2022-7bit}, whose
+terminal coding system is @code{iso-latin-1} (so the terminal actually
+displays the character as @samp{@`A}), and which has font-lock-mode
+(@pxref{Font Lock}) enabled:
 
 @smallexample
-Char: @`A (04300, 2240, 0x8c0, ext ESC , A @@) (latin-iso8859-1 64)
+    character: @`A (04300, 2240, 0x8c0)
+      charset: latin-iso8859-1
+	       (Right-Hand Part of Latin Alphabet 1@dots{}
+   code point: 64
+       syntax: w 	which means: word
+     category: l:Latin
+  buffer code: 0x81 0xC0
+    file code: ESC 2C 41 40 (encoded by coding system iso-2022-7bit)
+terminal code: C0
+
+Text properties
+  font-lock-face: font-lock-variable-name-face
+  fontified: t
 @end smallexample
 
 @node Arguments
@@ -690,16 +714,19 @@ act in the opposite direction.
   If your terminal keyboard has a @key{META} key, the easiest way to
 specify a numeric argument is to type digits and/or a minus sign while
 holding down the @key{META} key.  For example,
+
 @example
 M-5 C-n
 @end example
+
 @noindent
 would move down five lines.  The characters @kbd{Meta-1}, @kbd{Meta-2},
 and so on, as well as @kbd{Meta--}, do this because they are keys bound
 to commands (@code{digit-argument} and @code{negative-argument}) that
-are defined to contribute to an argument for the next command.  Digits
-and @kbd{-} modified with Control, or Control and Meta, also specify
-numeric arguments.
+are defined to contribute to an argument for the next command.
+@kbd{Meta--} without digits normally means @minus{}1.  Digits and
+@kbd{-} modified with Control, or Control and Meta, also specify numeric
+arguments.
 
 @kindex C-u
 @findex universal-argument
@@ -759,6 +786,13 @@ the command.
 @section Repeating a Command
 @cindex repeating a command
 
+  Many simple commands, such as those invoked with a single key or
+with @kbd{M-x @var{command-name} @key{RET}}, can be repeated by
+invoking them with a numeric argument that serves as a repeat count
+(@pxref{Arguments}).  However, if the command you want to repeat
+prompts for some input, or uses a numeric argument in another way,
+repetition using a numeric argument might be problematical.
+
 @kindex C-x z
 @findex repeat
   The command @kbd{C-x z} (@code{repeat}) provides another way to repeat