[Emacs-diffs] /srv/bzr/emacs/trunk r111916: * textprop.c: Use bool for booleans.

[Paul Eggert]

------------------------------------------------------------
revno: 111916
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2013-03-02 10:39:34 -0800
message:
  * textprop.c: Use bool for booleans.
  
  (validate_interval_range, Fadd_text_properties)
  (Fremove_text_properties): Prefer bool to int when either works.
modified:
  src/ChangeLog
  src/intervals.h
  src/textprop.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-02 09:28:53 +0000
+++ b/src/ChangeLog     2013-03-02 18:39:34 +0000
@@ -1,3 +1,9 @@
+2013-03-02  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * textprop.c (Fadd_text_properties, Fremove_text_properties): If

=== modified file 'src/intervals.h'
--- a/src/intervals.h   2013-02-26 03:09:08 +0000
+++ b/src/intervals.h   2013-03-02 18:39:34 +0000
@@ -259,7 +259,7 @@
 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.  */

=== modified file 'src/textprop.c'
--- a/src/textprop.c    2013-03-02 09:28:53 +0000
+++ b/src/textprop.c    2013-03-02 18:39:34 +0000
@@ -125,9 +125,10 @@
 #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 @@
   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 @@
   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);