1 files changed, 25 insertions, 25 deletions

diff --git a/src/intervals.h b/src/intervals.h
index 40f32645ba0..816ea105bd7 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -42,19 +42,19 @@ struct interval
     struct interval *interval;
     Lisp_Object obj;
   } up;
-  unsigned int up_obj : 1;
+  bool_bf up_obj : 1;
 
-  unsigned gcmarkbit : 1;
+  bool_bf gcmarkbit : 1;
 
   /* The remaining components are `properties' of the interval.
      The first four are duplicates for things which can be on the list,
      for purposes of speed.  */
 
-  unsigned int write_protect : 1;   /* Non-zero means can't modify.  */
-  unsigned int visible : 1;         /* Zero means don't display.  */
-  unsigned int front_sticky : 1;    /* Non-zero means text inserted just
+  bool_bf write_protect : 1;        /* True means can't modify.  */
+  bool_bf visible : 1;              /* False means don't display.  */
+  bool_bf front_sticky : 1;         /* True means text inserted just
                                        before this interval goes into it.  */
-  unsigned int rear_sticky : 1;     /* Likewise for just after it.  */
+  bool_bf rear_sticky : 1;          /* Likewise for just after it.  */
   Lisp_Object plist;                /* Other properties.  */
 };
 
@@ -116,7 +116,7 @@ struct interval
 
 /* Test what type of parent we have.  Three possibilities: another
    interval, a buffer or string object, or NULL.  */
-#define INTERVAL_HAS_PARENT(i) ((i)->up_obj == 0 && (i)->up.interval != 0)
+#define INTERVAL_HAS_PARENT(i) (! (i)->up_obj && (i)->up.interval != 0)
 #define INTERVAL_HAS_OBJECT(i) ((i)->up_obj)
 
 /* Use these macros to get parent of an interval.
@@ -126,9 +126,9 @@ struct interval
    progress.  */
 
 #define INTERVAL_PARENT(i)                                      \
-   (eassert ((i) != 0 && (i)->up_obj == 0), (i)->up.interval)
+   (eassert ((i) != 0 && ! (i)->up_obj), (i)->up.interval)
 
-#define GET_INTERVAL_OBJECT(d,s) (eassert ((s)->up_obj == 1), (d) = (s)->up.obj)
+#define GET_INTERVAL_OBJECT(d,s) (eassert ((s)->up_obj), (d) = (s)->up.obj)
 
 /* Use these functions to set Lisp_Object
    or pointer slots of struct interval.  */
@@ -136,7 +136,7 @@ struct interval
 INLINE void
 set_interval_parent (INTERVAL i, INTERVAL parent)
 {
-  i->up_obj = 0;
+  i->up_obj = false;
   i->up.interval = parent;
 }
 
@@ -154,33 +154,33 @@ set_interval_plist (INTERVAL i, Lisp_Object plist)
 
 /* Reset this interval to its vanilla, or no-property state.  */
 #define RESET_INTERVAL(i)                     \
-{                                             \
+ do {                                         \
   (i)->total_length = (i)->position = 0;      \
   (i)->left = (i)->right = NULL;              \
   set_interval_parent (i, NULL);              \
-  (i)->write_protect = 0;                     \
-  (i)->visible = 0;                           \
-  (i)->front_sticky = (i)->rear_sticky = 0;   \
+  (i)->write_protect = false;                 \
+  (i)->visible = false;                       \
+  (i)->front_sticky = (i)->rear_sticky = false; \
   set_interval_plist (i, Qnil);               \
-}
+ } while (false)
 
 /* Copy the cached property values of interval FROM to interval TO.  */
 #define COPY_INTERVAL_CACHE(from,to)            \
-{                                               \
+ do {                                           \
   (to)->write_protect = (from)->write_protect;  \
   (to)->visible = (from)->visible;              \
   (to)->front_sticky = (from)->front_sticky;    \
   (to)->rear_sticky = (from)->rear_sticky;      \
-}
+ } while (false)
 
 /* Copy only the set bits of FROM's cache.  */
-#define MERGE_INTERVAL_CACHE(from,to)                 \
-{                                                     \
-  if ((from)->write_protect) (to)->write_protect = 1; \
-  if ((from)->visible) (to)->visible = 1;             \
-  if ((from)->front_sticky) (to)->front_sticky = 1;   \
-  if ((from)->rear_sticky) (to)->rear_sticky = 1;     \
-}
+#define MERGE_INTERVAL_CACHE(from,to)                           \
+ do {                                                           \
+  if ((from)->write_protect) (to)->write_protect = true;        \
+  if ((from)->visible) (to)->visible = true;                    \
+  if ((from)->front_sticky) (to)->front_sticky = true;          \
+  if ((from)->rear_sticky) (to)->rear_sticky = true;            \
+ } while (false)
 
 /* Is this interval visible?  Replace later with cache access.  */
 #define INTERVAL_VISIBLE_P(i) \
@@ -198,7 +198,7 @@ set_interval_plist (INTERVAL i, Lisp_Object plist)
    should stick to it.  Now we have Vtext_property_default_nonsticky,
    so these macros are unreliable now and never used.  */
 
-#if 0
+#if false
 #define FRONT_STICKY_P(i)                               \
   (i && ! NILP (textget ((i)->plist, Qfront_sticky)))
 #define END_NONSTICKY_P(i)                              \