Cleanup intervals.

* intervals.h (NULL_INTERVAL, DEFAULT_INTERVAL): Remove.
(NULL_INTERVAL_P): Likewise.  Adjust users.
(FRONT_STICKY_P, END_NONSTICKY_P, FRONT_NONSTICKY_P): Adjust
comment.  Move under #if 0.
* alloc.c, buffer.c, editfns.c, fns.c, insdel.c, intervals.c:
* print.c, syntax.c, textprop.c, xdisp.c: Adjust users.

1 files changed, 14 insertions, 13 deletions

diff --git a/src/alloc.c b/src/alloc.c
index b6fe6fa2eb3..d342a722ca6 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1559,19 +1559,20 @@ mark_interval_tree (register INTERVAL tree)
 
 /* Mark the interval tree rooted in I.  */
 
-#define MARK_INTERVAL_TREE(i)                           \
-  do {                                                  \
-    if (!NULL_INTERVAL_P (i) && !i->gcmarkbit)          \
-      mark_interval_tree (i);                           \
+#define MARK_INTERVAL_TREE(i)   \
+  do {                          \
+    if (i && !i->gcmarkbit)     \
+      mark_interval_tree (i);   \
   } while (0)
 
+/* Unmark and rebalance interval tree rooted in I.  */
 
-#define UNMARK_BALANCE_INTERVALS(i)                     \
-  do {                                                  \
-   if (! NULL_INTERVAL_P (i))                           \
-     (i) = balance_intervals (i);                       \
+#define UNMARK_BALANCE_INTERVALS(i)     \
+  do {                                  \
+   if (i)                               \
+     (i) = balance_intervals (i);       \
   } while (0)
-
+
 /***********************************************************************
                           String Allocation
  ***********************************************************************/
@@ -2100,7 +2101,7 @@ sweep_strings (void)
                   /* String is live; unmark it and its intervals.  */
                   UNMARK_STRING (s);
 
-                  if (!NULL_INTERVAL_P (s->intervals))
+                  if (s->intervals)
                     UNMARK_BALANCE_INTERVALS (s->intervals);
 
                   ++total_strings;
@@ -2502,7 +2503,7 @@ make_uninit_multibyte_string (EMACS_INT nchars, EMACS_INT nbytes)
     return empty_multibyte_string;
 
   s = allocate_string ();
-  s->intervals = NULL_INTERVAL;
+  s->intervals = NULL;
   allocate_string_data (s, nchars, nbytes);
   XSETSTRING (string, s);
   string_chars_consed += nbytes;
@@ -5221,7 +5222,7 @@ make_pure_string (const char *data,
     }
   s->size = nchars;
   s->size_byte = multibyte ? nbytes : -1;
-  s->intervals = NULL_INTERVAL;
+  s->intervals = NULL;
   XSETSTRING (string, s);
   return string;
 }
@@ -5237,7 +5238,7 @@ make_pure_c_string (const char *data, ptrdiff_t nchars)
   s->size = nchars;
   s->size_byte = -1;
   s->data = (unsigned char *) data;
-  s->intervals = NULL_INTERVAL;
+  s->intervals = NULL;
   XSETSTRING (string, s);
   return string;
 }