From: Karl Heuer <kwzh@gnu.org>
Date: Tue, 27 Sep 1994 01:24:44 +0000 (+0000)
Subject: (Fmatch_data, Fstore_match_data): Use type test macros.
X-Git-Tag: emacs-19.34~6741
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ed62dc799f78709c04708ff89829e7d41c4d2f4;p=emacs.git

(Fmatch_data, Fstore_match_data): Use type test macros.
---

diff --git a/src/search.c b/src/search.c
index c77f7b7c202..0ac7018d22b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1504,7 +1504,7 @@ Use `store-match-data' to reinstate the data in this list.")
 	      XFASTINT (data[2 * i]) = start;
 	      XFASTINT (data[2 * i + 1]) = search_regs.end[i];
 	    }
-	  else if (XTYPE (last_thing_searched) == Lisp_Buffer)
+	  else if (BUFFERP (last_thing_searched))
 	    {
 	      data[2 * i] = Fmake_marker ();
 	      Fset_marker (data[2 * i],
@@ -1584,7 +1584,7 @@ LIST should have been created by calling `match-data' previously.")
 	}
       else
 	{
-	  if (XTYPE (marker) == Lisp_Marker)
+	  if (MARKERP (marker))
 	    {
 	      if (XMARKER (marker)->buffer == 0)
 		XFASTINT (marker) = 0;
@@ -1598,8 +1598,7 @@ LIST should have been created by calling `match-data' previously.")
 	  list = Fcdr (list);
 
 	  marker = Fcar (list);
-	  if (XTYPE (marker) == Lisp_Marker
-	      && XMARKER (marker)->buffer == 0)
+	  if (MARKERP (marker) && XMARKER (marker)->buffer == 0)
 	    XFASTINT (marker) = 0;
 
 	  CHECK_NUMBER_COERCE_MARKER (marker, 0);