# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1203458289 0
# Node ID 48f9158be83351cf1e625ecae140c17e3f388f5a
# Parent  f200e5de54649a8429eccf8f73c02a5a539dd218
(INT_LISPLIKE): Remove.  It may misfire.
(NULL_INTERVAL_P, SET_INTERVAL_PARENT): Don't use it.

diff -r f200e5de5464 -r 48f9158be833 src/ChangeLog
--- a/src/ChangeLog	Tue Feb 19 21:31:20 2008 +0000
+++ b/src/ChangeLog	Tue Feb 19 21:58:09 2008 +0000
@@ -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 -r f200e5de5464 -r 48f9158be833 src/intervals.h
--- a/src/intervals.h	Tue Feb 19 21:31:20 2008 +0000
+++ b/src/intervals.h	Tue Feb 19 21:58:09 2008 +0000
@@ -75,24 +75,7 @@
 /* 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 @@
    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) \