merge from trunk

2 files changed, 11 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 548ae5ab2c0..8a3186b85f2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,10 @@
 
         * decompress.c (unwind_decompress): Always restore point.
 
+2013-08-14  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * marker.c (set_marker): Reformat documentation.
+
 2013-08-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         * xdisp.c (cursor_type_changed): Now static.
diff --git a/src/marker.c b/src/marker.c
index 6c50def51a3..d25e7104b57 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -534,10 +534,13 @@ set_marker_internal (Lisp_Object marker, Lisp_Object position,
 }
 
 DEFUN ("set-marker", Fset_marker, Sset_marker, 2, 3, 0,
-       doc: /* Position MARKER before character number POSITION in BUFFER,
-which defaults to the current buffer.  If POSITION is nil,
-makes marker point nowhere so it no longer slows down
-editing in any buffer.  Returns MARKER.  */)
+       doc: /* Position MARKER before character number POSITION in BUFFER.
+If BUFFER is omitted or nil, it defaults to the current buffer.  If
+POSITION is less than 1, MARKER is moved to the beginning of the
+buffer.  If POSITION is greater than the size of the buffer, marker is
+moved to the end of the buffer.  If POSITION is nil, makes marker
+point nowhere so it no longer slows down editing in any buffer.
+Returns MARKER.  */)
   (Lisp_Object marker, Lisp_Object position, Lisp_Object buffer)
 {
   return set_marker_internal (marker, position, buffer, 0);