Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 414-422)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 128-130)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108

1 files changed, 2 insertions, 1 deletions

diff --git a/src/marker.c b/src/marker.c
index 82e62e0aa99..9f2aa4826b4 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -460,7 +460,8 @@ Returns nil if MARKER points into a dead buffer.  */)
 }
 
 DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0,
-       doc: /* Return the position MARKER points at, as a character number.  */)
+       doc: /* Return the position MARKER points at, as a character number.
+Returns nil if MARKER points nowhere.  */)
      (marker)
      Lisp_Object marker;
 {