From: Lars Magne Ingebrigtsen Date: Wed, 13 Jul 2011 16:58:15 +0000 (+0200) Subject: Clarify `mark-ring-max' documentation. X-Git-Tag: emacs-pretest-24.0.90~104^2~314 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c75883645245f01232b98b72e3b417a1fd3c6569;p=emacs.git Clarify `mark-ring-max' documentation. * mark.texi (Mark Ring): Clarify how many locations are saved (bug#5770). (Global Mark Ring): Ditto. --- diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index bd5cfdce66b..ce2a5e998e3 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,9 @@ +2011-07-13 Lars Magne Ingebrigtsen + + * mark.texi (Mark Ring): Clarify how many locations are saved + (bug#5770). + (Global Mark Ring): Ditto. + 2011-07-12 Lars Magne Ingebrigtsen * text.texi (Table Recognition): Use "at point" instead of "under diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 20cc127d272..1a93f5b79c8 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -253,7 +253,9 @@ Another effect of this mode is that some keys, such as @key{DEL} and @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 +@dfn{mark 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 @@ Positions in Registers}). @section The Global Mark Ring @cindex global mark ring +@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 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 C-@key{SPC} @findex pop-global-mark