Mechanically change INT to FIXNUM in our sources. src/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT (where it refers to non-bignum Lisp integers) to FIXNUM in our sources. Done for the following functions, enums, and macros: Lisp_Type_Int_Even, Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(), XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(), EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT. The EMACS_INT typedef was not changed, it does not describe non-bignum Lisp integers. Script that did the change available in http://mid.gmane.org/20067.17650.181273.12014@parhasard.net . modules/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers. See the src/ChangeLog entry for more details. man/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> * internals/internals.texi (How Lisp Objects Are Represented in C): * internals/internals.texi (Integers and Characters): Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers.

--- a/src/number.h	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/number.h	Sun Oct 09 09:51:57 2011 +0100
@@ -129,7 +129,7 @@
 
 /********************************* Integers *********************************/
 /* Qintegerp in lisp.h */
-#define INTEGERP(x) (INTP(x) || BIGNUMP(x))
+#define INTEGERP(x) (FIXNUMP(x) || BIGNUMP(x))
 #define CHECK_INTEGER(x) do {			\
  if (!INTEGERP (x))				\
    dead_wrong_type_argument (Qintegerp, x);	\
@@ -141,9 +141,9 @@
 
 #ifdef HAVE_BIGNUM
 #define make_integer(x) \
-  (NUMBER_FITS_IN_AN_EMACS_INT (x) ? make_int (x) : make_bignum (x))
+  (NUMBER_FITS_IN_A_FIXNUM (x) ? make_fixnum (x) : make_bignum (x))
 #else
-#define make_integer(x) make_int (x)
+#define make_integer(x) make_fixnum (x)
 #endif
 
 extern Fixnum Vmost_negative_fixnum, Vmost_positive_fixnum;
@@ -169,10 +169,10 @@
    NATNUMP. */
 
 #ifdef HAVE_BIGNUM
-#define NATNUMP(x) ((INTP (x) && XINT (x) >= 0) || \
+#define NATNUMP(x) ((FIXNUMP (x) && XFIXNUM (x) >= 0) || \
                     (BIGNUMP (x) && bignum_sign (XBIGNUM_DATA (x)) >= 0))
 #else
-#define NATNUMP(x) (INTP (x) && XINT (x) >= 0)
+#define NATNUMP(x) (FIXNUMP (x) && XFIXNUM (x) >= 0)
 #endif
 
 #define CHECK_NATNUM(x) do {			\