(dired-buffers, dired-subdir-alist): Add defvars.

[gnu-emacs] / man / basic.texi

diff --git a/man/basic.texi b/man/basic.texi
index 3fbaff2a1e7df44e1ace3601f382f0643cf2905f..2f5aa3162e17d3852b56600d99a11427af4ef7e8 100644 (file)
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -1,5 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985,86,87,93,94,95,97,2000,2001 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
+@c   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Basic, Minibuffer, Exiting, Top
 @chapter Basic Editing Commands
@@ -238,9 +239,12 @@ it is commonly used to do so.  If your keyboard has a @key{PAGEUP} or
 Read a number @var{n} and move point to buffer position @var{n}.
 Position 1 is the beginning of the buffer.
 @item M-g M-g
+@itemx M-g g
 @itemx M-x goto-line
-Read a number @var{n} and move point to line number @var{n}.  Line 1
-is the beginning of the buffer.
+Read a number @var{n} and move point to the beginning of line number
+@var{n}.  Line 1 is the beginning of the buffer.  If point is on or
+just after a number, then that is the default for @var{n}, if you just
+press @key{RET} with an empty minibuffer.
 @item C-x C-n
 @findex set-goal-column
 @kindex C-x C-n
@@ -595,19 +599,13 @@ Toggle automatic display of the size of the buffer.
 @cindex location of point
 @cindex cursor location
 @cindex point location
-  There are two commands for working with line numbers.  @kbd{M-x
-what-line} computes the current line number and displays it in the
-echo area.  To go to a given line by number, use @kbd{M-g M-g} or
-@kbd{M-g g} (@code{goto-line}).  This prompts you for a line number,
-then moves point to the beginning of that line.  To move to a given
-line in the most recently displayed other buffer, use @kbd{C-u M-g
-M-g}.  Line numbers in Emacs count from one at the beginning of the buffer.
-
-  You can also see the current line number in the mode line; see @ref{Mode
-Line}.  If you narrow the buffer, then the line number in the mode line
-is relative to the accessible portion (@pxref{Narrowing}).  By contrast,
-@code{what-line} shows both the line number relative to the narrowed
-region and the line number relative to the whole buffer.
+  @kbd{M-x what-line} computes the current line number and displays it
+in the echo area.  You can also see the current line number in the
+mode line; see @ref{Mode Line}.  If you narrow the buffer, then the
+line number in the mode line is relative to the accessible portion
+(@pxref{Narrowing}).  By contrast, @code{what-line} shows both the
+line number relative to the narrowed 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, showing both numbers in the echo area.