(Fset_marker, set_marker_restricted, Fcopy_marker): Use type test macros.

diff --git a/src/marker.c b/src/marker.c
index fbf48da1c70f9e1485900346a6140dffe00787ad..a5cc631fcdb8d7967cea47f3b95ca0c2636559f2 100644 (file)
--- a/src/marker.c
+++ b/src/marker.c
@@ -88,7 +88,7 @@ Returns MARKER.")
   /* If position is nil or a marker that points nowhere,
      make this marker point nowhere.  */
   if (NILP (pos)
-      || (XTYPE (pos) == Lisp_Marker && !XMARKER (pos)->buffer))
+      || (MARKERP (pos) && !XMARKER (pos)->buffer))
     {
       unchain_marker (marker);
       return marker;
@@ -145,7 +145,7 @@ set_marker_restricted (marker, pos, buffer)
   /* If position is nil or a marker that points nowhere,
      make this marker point nowhere.  */
   if (NILP (pos) ||
-      (XTYPE (pos) == Lisp_Marker && !XMARKER (pos)->buffer))
+      (MARKERP (pos) && !XMARKER (pos)->buffer))
     {
       unchain_marker (marker);
       return marker;
@@ -271,14 +271,11 @@ at that position in the current buffer.")
 
   while (1)
     {
-      if (XTYPE (marker) == Lisp_Int
-         || XTYPE (marker) == Lisp_Marker)
+      if (INTEGERP (marker) || MARKERP (marker))
        {
          new = Fmake_marker ();
          Fset_marker (new, marker,
-                      ((XTYPE (marker) == Lisp_Marker)
-                       ? Fmarker_buffer (marker)
-                       : Qnil));
+                      (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil));
          return new;
        }
       else