[Emacs-diffs] /srv/bzr/emacs/trunk r105169: Clarify `mark-ring-max' documentation.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105169
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-13 18:58:15 +0200
message:
  Clarify `mark-ring-max' documentation.
  
  * mark.texi (Mark Ring): Clarify how many locations are saved
  (bug#5770).
  (Global Mark Ring): Ditto.
modified:
  doc/emacs/ChangeLog
  doc/emacs/mark.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-07-12 22:39:21 +0000
+++ b/doc/emacs/ChangeLog       2011-07-13 16:58:15 +0000
@@ -1,3 +1,9 @@
+2011-07-13  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mark.texi (Mark Ring): Clarify how many locations are saved
+       (bug#5770).
+       (Global Mark Ring): Ditto.
+
 2011-07-12  Lars Magne Ingebrigtsen  <address@hidden>
 
        * text.texi (Table Recognition): Use "at point" instead of "under

=== modified file 'doc/emacs/mark.texi'
--- a/doc/emacs/mark.texi       2011-07-11 18:40:48 +0000
+++ b/doc/emacs/mark.texi       2011-07-13 16:58:15 +0000
@@ -253,7 +253,9 @@
 @cindex mark ring
   Aside from delimiting the region, the mark is also useful for
 remembering spots that you may want to go back to.  Each buffer
-remembers 16 previous locations of the mark, in the @dfn{mark ring}.
+remembers @code{mark-ring-max} previous locations of the mark, in the
address@hidden ring}.  This defaults to 16 locations.
+
 Commands that set the mark also push the old mark onto this ring.
 
 @table @kbd
@@ -315,10 +317,12 @@
 @section The Global Mark Ring
 @cindex global mark ring
 
address@hidden 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 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.
 
 @kindex C-x address@hidden
 @findex pop-global-mark