merge from trunk

2 files changed, 6 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dd4697298ac..5dc29ff47ab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-16  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * marker.c (set_marker): Remove documentation of undefined behavior.
+
 2013-08-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * image.c (imagemagick_compute_animated_image): Animate correctly
diff --git a/src/marker.c b/src/marker.c
index d25e7104b57..2f91bdf9727 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -536,11 +536,8 @@ 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.
 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.  */)
+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);