summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/mark.texi9
-rw-r--r--doc/emacs/windows.texi10
3 files changed, 16 insertions, 8 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 761be847da2..6e687bcefc9 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-21 Chong Yidong <cyd@gnu.org>
+
+ * mark.texi (Global Mark Ring): Fix description of global mark
+ ring (Bug#10032).
+
2011-11-20 Juanma Barranquero <lekktu@gmail.com>
* msdog.texi (Windows Fonts): Fix typo.
diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index 0eccef41711..7d65719e5f0 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -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
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index ad2040c9047..c44b67454a2 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -34,11 +34,11 @@ has its own value of point.
@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.
+@xref{Cursor 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