From: Karl Heuer <kwzh@gnu.org>
Date: Tue, 27 Sep 1994 02:24:00 +0000 (+0000)
Subject: (Fset_marker, set_marker_restricted, Fcopy_marker): Use type test macros.
X-Git-Tag: emacs-19.34~6733
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8e68e490b703faf7b1431b201b8a07ad97007cf;p=emacs.git

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

diff --git a/src/marker.c b/src/marker.c
index fbf48da1c70..a5cc631fcdb 100644
--- 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