(create_root_interval, balance_possible_root_interval, delete_interval): Use

type test macros.

diff --git a/src/intervals.c b/src/intervals.c
index 8386eaded5a61e04826341f315719f03a24626c1..5ec26e2d30141ff53938f1132175f38c990460c5 100644 (file)
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -70,13 +70,13 @@ create_root_interval (parent)
 
   new = make_interval ();
 
-  if (XTYPE (parent) == Lisp_Buffer)
+  if (BUFFERP (parent))
     {
       new->total_length = (BUF_Z (XBUFFER (parent))
                           - BUF_BEG (XBUFFER (parent)));
       XBUFFER (parent)->intervals = new;
     }
-  else if (XTYPE (parent) == Lisp_String)
+  else if (STRINGP (parent))
     {
       new->total_length = XSTRING (parent)->size;
       XSTRING (parent)->intervals = new;
@@ -411,9 +411,9 @@ balance_possible_root_interval (interval)
   parent = (Lisp_Object) (interval->parent);
   interval = balance_an_interval (interval);
 
-  if (XTYPE (parent) == Lisp_Buffer)
+  if (BUFFERP (parent))
     XBUFFER (parent)->intervals = interval;
-  else if (XTYPE (parent) == Lisp_String)
+  else if (STRINGP (parent))
     XSTRING (parent)->intervals = interval;
 
   return interval;
@@ -1049,9 +1049,9 @@ delete_interval (i)
       if (! NULL_INTERVAL_P (parent))
        parent->parent = (INTERVAL) owner;
 
-      if (XTYPE (owner) == Lisp_Buffer)
+      if (BUFFERP (owner))
        XBUFFER (owner)->intervals = parent;
-      else if (XTYPE (owner) == Lisp_String)
+      else if (STRINGP (owner))
        XSTRING (owner)->intervals = parent;
       else
        abort ();