Merge branch 'trunk' into xwidget

Conflicts:
	src/window.c

1 files changed, 6 insertions, 0 deletions

diff --git a/src/marker.c b/src/marker.c
index 63027d3be5e..6c50def51a3 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -127,6 +127,12 @@ clear_charpos_cache (struct buffer *b)
     }                                                                   \
 }
 
+static void
+CHECK_MARKER (Lisp_Object x)
+{
+  CHECK_TYPE (MARKERP (x), Qmarkerp, x);
+}
+
 /* Return the byte position corresponding to CHARPOS in B.  */
 
 ptrdiff_t