[Emacs-diffs] /srv/bzr/emacs/trunk r106460: * doc/emacs/mark.texi (Global Mark Ring): Fix global mark ring description.

[Chong Yidong]

------------------------------------------------------------
revno: 106460
fixes bug(s): http://debbugs.gnu.org/10032
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2011-11-21 14:16:49 +0800
message:
  * doc/emacs/mark.texi (Global Mark Ring): Fix global mark ring description.
modified:
  doc/emacs/ChangeLog
  doc/emacs/mark.texi
  doc/emacs/windows.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-11-20 19:35:27 +0000
+++ b/doc/emacs/ChangeLog       2011-11-21 06:16:49 +0000
@@ -1,3 +1,8 @@
+2011-11-21  Chong Yidong  <address@hidden>
+
+       * mark.texi (Global Mark Ring): Fix description of global mark
+       ring (Bug#10032).
+
 2011-11-20  Juanma Barranquero  <address@hidden>
 
        * msdog.texi (Windows Fonts): Fix typo.

=== modified file 'doc/emacs/mark.texi'
--- a/doc/emacs/mark.texi       2011-10-13 16:03:49 +0000
+++ b/doc/emacs/mark.texi       2011-11-21 06:16:49 +0000
@@ -354,9 +354,12 @@
 @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
address@hidden, and is 16 by default.
 
 @kindex C-x address@hidden
 @findex pop-global-mark

=== modified file 'doc/emacs/windows.texi'
--- a/doc/emacs/windows.texi    2011-11-06 06:14:01 +0000
+++ b/doc/emacs/windows.texi    2011-11-21 06:16:49 +0000
@@ -34,11 +34,11 @@
 
 @cindex selected window
   At any time, one Emacs window is the @dfn{selected window}; the
-buffer this window is displaying is the current buffer.  Each window
-has its own value of point.  On graphical displays, the point is
-indicated by a solid blinking cursor in the selected window, and by a
-hollow box in non-selected windows.  On text-only terminals, the
-cursor is drawn only in the selected window.  @xref{Cursor Display}.
+buffer this window is displaying is the current buffer.  On graphical
+displays, the point is indicated by a solid blinking cursor in the
+selected window, and by a hollow box in non-selected windows.  On
+text-only terminals, the cursor is drawn only in the selected window.
address@hidden Display}.
 
   Commands to move point affect the value of point for the selected
 Emacs window only.  They do not change the value of point in other