(INT_LISPLIKE): Remove. It may misfire.

(NULL_INTERVAL_P, SET_INTERVAL_PARENT): Don't use it.

diff --git a/src/ChangeLog b/src/ChangeLog
index eb35d2c698ae7cc94f179baa835c477581119d16..86eb60d04803e4676eddd7bfead7d79d488f7ecb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * intervals.h (INT_LISPLIKE): Remove.  It may misfire.
+       (NULL_INTERVAL_P, SET_INTERVAL_PARENT): Don't use it.
+
 2008-02-18  Jason Rumney  <jasonr@gnu.org>
 
        * w32fns.c (Fw32_shell_execute): Encode parameters.

diff --git a/src/intervals.h b/src/intervals.h
index f7208db7abac988db6434c45eab5aa836d465ece..29d28bef09ce924c97ce63d337665f23c79e038f 100644 (file)
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -75,24 +75,7 @@ struct interval
 /* Size of a pointer to an interval structure */
 #define INTERVAL_PTR_SIZE (sizeof (struct interval *))
 
-/* True if an interval pointer is null, or is a Lisp_Buffer or
-   Lisp_String pointer (meaning it points to the owner of this
-   interval tree). */
-#ifdef NO_UNION_TYPE
-#define INT_LISPLIKE(i) (BUFFERP ((Lisp_Object)(i)) \
-                        || STRINGP ((Lisp_Object)(i)))
-#else
-#define INT_LISPLIKE(i) (BUFFERP ((Lisp_Object){(EMACS_INT)(i)}) \
-                        || STRINGP ((Lisp_Object){(EMACS_INT)(i)}))
-#endif
-
-#ifdef ENABLE_CHECKING
-#define NULL_INTERVAL_P(i) \
-   (CHECK (!INT_LISPLIKE (i), "non-interval"), (i) == NULL_INTERVAL)
-/* old #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL || INT_LISPLIKE (i)) */
-#else
 #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL)
-#endif
 
 /* True if this interval has no right child. */
 #define NULL_RIGHT_CHILD(i) ((i)->right == NULL_INTERVAL)
@@ -162,7 +145,7 @@ struct interval
    casts to get around this, it will break some development work in
    progress.  */
 #define SET_INTERVAL_PARENT(i,p) \
-   (eassert (!INT_LISPLIKE (p)), (i)->up_obj = 0, (i)->up.interval = (p))
+   ((i)->up_obj = 0, (i)->up.interval = (p))
 #define SET_INTERVAL_OBJECT(i,o) \
    (eassert (BUFFERP (o) || STRINGP (o)), (i)->up_obj = 1, (i)->up.obj = (o))
 #define INTERVAL_PARENT(i) \