Merge from emacs-24; up to 2012-11-15T23:31:37Z!dancol@dancol.org

[bpt/emacs.git] / doc / emacs / mark.texi

diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 0eccef4..db191eb 100644 (file)
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -1,8 +1,8 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2011
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2012
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
-@node Mark, Killing, Help, Top
+@node Mark
 @chapter The Mark and the Region
 @cindex mark
 @cindex setting a mark
@@ -354,9 +354,12 @@ Positions in Registers}).
 @vindex global-mark-ring-max
   In addition to the ordinary mark ring that belongs to each buffer,
 Emacs has a single @dfn{global mark ring}.  Each time you set a mark,
-in any buffer, this is recorded in the global mark ring in addition to
-the current buffer's own mark ring.  The length of this ring can be
-controlled by @code{global-mark-ring-max}, and is 16 by default.
+this is recorded in the global mark ring in addition to the current
+buffer's own mark ring, if you have switched buffers since the
+previous mark setting.  Hence, the global mark ring records a sequence
+of buffers that you have been in, and, for each buffer, a place where
+you set the mark.  The length of the global mark ring is controlled by
+@code{global-mark-ring-max}, and is 16 by default.
 
 @kindex C-x C-@key{SPC}
 @findex pop-global-mark
@@ -426,10 +429,6 @@ soon, before you forget where it is.  You can also check where the
 mark is by using @kbd{C-x C-x}, which exchanges the positions of the
 point and the mark (@pxref{Setting Mark}).
 
-@item
-Many commands that move point long distances, like @kbd{M-<} and
-@kbd{C-s}, first set the mark where point was.
-
 @item
 Some commands, which ordinarily act on the region when the mark is
 active, no longer do so.  For example, normally @kbd{M-%}
@@ -452,9 +451,10 @@ command twice.)
 
 @item C-u C-x C-x
 @kindex C-u C-x C-x
-Activate the mark and enable Transient Mark mode temporarily, until
-the mark is next deactivated.  (This is the @kbd{C-x C-x} command,
-@code{exchange-point-and-mark}, with a prefix argument.)
+Exchange point and mark, activate the mark and enable Transient Mark
+mode temporarily, until the mark is next deactivated.  (This is the
+@kbd{C-x C-x} command, @code{exchange-point-and-mark}, with a prefix
+argument.)
 @end table
 
   These commands set or activate the mark, and enable Transient Mark