merge from trunk

2 files changed, 4 insertions, 1 deletions

diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index cae14ab9a78..05c3fc56fd4 100644
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -279,6 +279,8 @@ This function returns the position that @var{marker} points to, or
 This function returns the buffer that @var{marker} points into, or
 @code{nil} if it points nowhere.
 
+@c FIXME: The `buffer' argument of `set-marker' already defaults to
+@c the current buffer, why use `(current-buffer)' explicitly here?
 @example
 @group
 (setq m (make-marker))
@@ -384,6 +386,7 @@ This is another name for @code{set-marker}.
 @node The Mark
 @section The Mark
 @cindex mark, the
+@c @cindex the mark?
 @cindex mark ring
 
   Each buffer has a special marker, which is designated @dfn{the
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 5cb1a851a5b..8a883061b93 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -805,7 +805,7 @@ thousands of times in the Lisp sources of Emacs.
 buffer, use @code{save-current-buffer} or @code{with-current-buffer}
 instead (@pxref{Current Buffer}).  If you need to save or restore
 window configurations, see the forms described in @ref{Window
-Configurations} and in @ref{Frame Configurations}.
+Configurations} and in @ref{Frame Configurations}. @c frameset?
 
 @defspec save-excursion body@dots{}
 @cindex mark excursion