Use bool for Emacs Lisp booleans.

This is more natural, and on my platform (GCC 4.7.1 x86-64) it
makes Emacs's text size .03% smaller and presumably a bit faster.
* admin/merge-gnulib (GNULIB_MODULES): Add stdbool.  This documents a
new direct dependency; stdbool was already being used indirectly
via other gnulib modules.
* lib-src/make-docfile.c (enum global_type): Sort values roughly in
decreasing alignment, except put functions last.
(compare_globals): Use this new property of enum global_type.
(write_globals): Use bool, not int, for booleans.
* src/lisp.h: Include <stdbool.h>.
(struct Lisp_Boolfwd, defvar_bool):
* src/lread.c (defvar_bool): Use bool, not int, for Lisp booleans.
* src/regex.c [!emacs]: Include <stdbool.h>.
(false, true): Remove; <stdbool.h> does this for us now.

4 files changed, 16 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 956d6922d2e..ed711b3a663 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2012-08-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use bool, not int, for Lisp booleans.
+        This is more natural, and on my platform (GCC 4.7.1 x86-64) it
+        makes Emacs a bit smaller and presumably a bit faster.
+        * lisp.h: Include <stdbool.h>.
+        (struct Lisp_Boolfwd, defvar_bool):
+        * lread.c (defvar_bool): Use bool, not int, for Lisp booleans.
+        * regex.c [!emacs]: Include <stdbool.h>.
+        (false, true): Remove; <stdbool.h> does this for us now.
+
 2012-08-14  Chong Yidong  <cyd@gnu.org>
 
         * character.c (Fcharacterp): Doc fix (Bug#12076).
diff --git a/src/lisp.h b/src/lisp.h
index f6aa46d3f41..a0d47b3895e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stdalign.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <inttypes.h>
 #include <limits.h>
@@ -1394,7 +1395,7 @@ struct Lisp_Intfwd
 struct Lisp_Boolfwd
   {
     enum Lisp_Fwd_Type type;    /* = Lisp_Fwd_Bool */
-    int *boolvar;
+    bool *boolvar;
   };
 
 /* Forwarding pointer to a Lisp_Object variable.
@@ -1929,7 +1930,7 @@ enum maxargs
 
 extern void defvar_lisp (struct Lisp_Objfwd *, const char *, Lisp_Object *);
 extern void defvar_lisp_nopro (struct Lisp_Objfwd *, const char *, Lisp_Object *);
-extern void defvar_bool (struct Lisp_Boolfwd *, const char *, int *);
+extern void defvar_bool (struct Lisp_Boolfwd *, const char *, bool *);
 extern void defvar_int (struct Lisp_Intfwd *, const char *, EMACS_INT *);
 extern void defvar_kboard (struct Lisp_Kboard_Objfwd *, const char *, int);
 
diff --git a/src/lread.c b/src/lread.c
index 3dd13c37f44..72991e92bae 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3987,7 +3987,7 @@ defvar_int (struct Lisp_Intfwd *i_fwd,
    nil if address contains 0.  */
 void
 defvar_bool (struct Lisp_Boolfwd *b_fwd,
-             const char *namestring, int *address)
+             const char *namestring, bool *address)
 {
   Lisp_Object sym;
   sym = intern_c_string (namestring);
diff --git a/src/regex.c b/src/regex.c
index afe3751ea5e..472ef727979 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -248,6 +248,7 @@ xrealloc (void *block, size_t size)
 # endif
 # define realloc xrealloc
 
+# include <stdbool.h>
 # include <string.h>
 
 /* Define the syntax stuff for \<, \>, etc.  */
@@ -535,8 +536,6 @@ typedef const unsigned char re_char;
 #endif
 
 typedef char boolean;
-#define false 0
-#define true 1
 
 static regoff_t re_match_2_internal (struct re_pattern_buffer *bufp,
                                      re_char *string1, size_t size1,