* textprop.c: Use bool for booleans.

(validate_interval_range, Fadd_text_properties)
(Fremove_text_properties): Prefer bool to int when either works.

diff --git a/src/ChangeLog b/src/ChangeLog
index 35cbab8409607d882aa2deced4bf1a4fcf2323df..a68b16f862c99f436ec7b300ccb62cbbf7d00acb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * textprop.c: Use bool for booleans.
+       (validate_interval_range, Fadd_text_properties)
+       (Fremove_text_properties): Prefer bool to int when either works.
+
 2013-03-02  Eli Zaretskii  <eliz@gnu.org>
 
        * textprop.c (Fadd_text_properties, Fremove_text_properties): If

diff --git a/src/intervals.h b/src/intervals.h
index d6191225b1fe123c119f785920d6ded902ddb6f6..a38e83cf10e9036fa78f59e0a8525de41aef02df 100644 (file)
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -259,7 +259,7 @@ extern Lisp_Object get_local_map (ptrdiff_t, struct buffer *, Lisp_Object);
 extern INTERVAL update_interval (INTERVAL, ptrdiff_t);
 extern void set_intervals_multibyte (bool);
 extern INTERVAL validate_interval_range (Lisp_Object, Lisp_Object *,
-                                         Lisp_Object *, int);
+                                         Lisp_Object *, bool);
 extern INTERVAL interval_of (ptrdiff_t, Lisp_Object);
 
 /* Defined in xdisp.c.  */

diff --git a/src/textprop.c b/src/textprop.c
index 34009131c096fe77c91e4637f7f8774722dbb385..18e893b3ef25f89f65a156b6679fd850c7eee6fd 100644 (file)
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -125,9 +125,10 @@ modify_region (Lisp_Object buffer, Lisp_Object start, Lisp_Object end)
 #define hard 1
 
 INTERVAL
-validate_interval_range (Lisp_Object object, Lisp_Object *begin, Lisp_Object *end, int force)
+validate_interval_range (Lisp_Object object, Lisp_Object *begin,
+                        Lisp_Object *end, bool force)
 {
-  register INTERVAL i;
+  INTERVAL i;
   ptrdiff_t searchpos;
 
   CHECK_STRING_OR_BUFFER (object);
@@ -1131,7 +1132,7 @@ Return t if any property value actually changed, nil otherwise.  */)
   ptrdiff_t s, len;
   bool modified = 0;
   struct gcpro gcpro1;
-  int first_time = 1;
+  bool first_time = 1;
 
   properties = validate_plist (properties);
   if (NILP (properties))
@@ -1446,7 +1447,7 @@ Use `set-text-properties' if you want to remove all text properties.  */)
   INTERVAL i, unchanged;
   ptrdiff_t s, len;
   bool modified = 0;
-  int first_time = 1;
+  bool first_time = 1;
 
   if (NILP (object))
     XSETBUFFER (object, current_buffer);