Use make_fixnum instead of

make_number, FIXNUMP instead of INTEGERP.

diff --git a/src/bytecode.c b/src/bytecode.c
index b142e3e667e081278a9ac42b76264891753c3b7e..6635a9b60e7a71304a0309a6a2206e059003937d 100644 (file)
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -705,7 +705,7 @@ If the third argument is incorrect, Emacs may crash.")
 
                v1 = TOP;
                v2 = Fget (v1, Qbyte_code_meter);
-               if (INTEGERP (v2)
+               if (FIXNUMP (v2)
                    && XINT (v2) != ((1<<VALBITS)-1))
                  {
                    XSETINT (v2, XINT (v2) + 1);
@@ -1126,7 +1126,7 @@ If the third argument is incorrect, Emacs may crash.")
          {
            Lisp_Object v1;
            v1 = TOP;
-           if (INTEGERP (v1))
+           if (FIXNUMP (v1))
              {
                XSETINT (v1, XINT (v1) - 1);
                TOP = v1;
@@ -1140,7 +1140,7 @@ If the third argument is incorrect, Emacs may crash.")
          {
            Lisp_Object v1;
            v1 = TOP;
-           if (INTEGERP (v1))
+           if (FIXNUMP (v1))
              {
                XSETINT (v1, XINT (v1) + 1);
                TOP = v1;
@@ -1226,7 +1226,7 @@ If the third argument is incorrect, Emacs may crash.")
          {
            Lisp_Object v1;
            v1 = TOP;
-           if (INTEGERP (v1))
+           if (FIXNUMP (v1))
              {
                XSETINT (v1, - XINT (v1));
                TOP = v1;
@@ -1690,7 +1690,7 @@ If the third argument is incorrect, Emacs may crash.")
          break;
 
        case Bintegerp:
-         TOP = INTEGERP (TOP) ? Qt : Qnil;
+         TOP = FIXNUMP (TOP) ? Qt : Qnil;
          break;
 
 #ifdef BYTE_CODE_SAFE
@@ -1766,14 +1766,14 @@ If a symbol has a property named `byte-code-meter' whose value is an\n\
 integer, it is incremented each time that symbol's function is called.");
 
   byte_metering_on = 0;
-  Vbyte_code_meter = Fmake_vector (make_number (256), make_number (0));
+  Vbyte_code_meter = Fmake_vector (make_fixnum (256), make_fixnum (0));
   Qbyte_code_meter = intern ("byte-code-meter");
   staticpro (&Qbyte_code_meter);
   {
     int i = 256;
     while (i--)
       XVECTOR (Vbyte_code_meter)->contents[i] =
-       Fmake_vector (make_number (256), make_number (0));
+       Fmake_vector (make_fixnum (256), make_fixnum (0));
   }
 #endif
 }

diff --git a/src/category.c b/src/category.c
index e77d6f3b753bb603cbb773d384bf78f481c61c22..7dc531671d717fafb8dd1c44dec2fbe2faade98d 100644 (file)
--- a/src/category.c
+++ b/src/category.c
@@ -131,7 +131,7 @@ to modify; it defaults to the current buffer's category table.")
 
   for (i = ' '; i <= '~'; i++)
     if (NILP (CATEGORY_DOCSTRING (table, i)))
-      return make_number (i);
+      return make_fixnum (i);
 
   return Qnil;
 }
@@ -211,8 +211,8 @@ copy_category_table (table)
       /* Also copy the first (and sole) extra slot.  It is a vector
          containing docstring of each category.  */
       Fset_char_table_extra_slot
-       (table, make_number (0),
-        Fcopy_sequence (Fchar_table_extra_slot (table, make_number (0))));
+       (table, make_fixnum (0),
+        Fcopy_sequence (Fchar_table_extra_slot (table, make_fixnum (0))));
     }
   else
     {
@@ -259,8 +259,8 @@ DEFUN ("make-category-table", Fmake_category_table, Smake_category_table,
 
   val = Fmake_char_table (Qcategory_table, Qnil);
   XCHAR_TABLE (val)->defalt = MAKE_CATEGORY_SET;
-  Fset_char_table_extra_slot (val, make_number (0),
-                             Fmake_vector (make_number (95), Qnil));
+  Fset_char_table_extra_slot (val, make_fixnum (0),
+                             Fmake_vector (make_fixnum (95), Qnil));
   return val;
 }
 
@@ -477,7 +477,7 @@ describe_category (value)
 {
   Lisp_Object mnemonics;
 
-  Findent_to (make_number (16), make_number (1));
+  Findent_to (make_fixnum (16), make_fixnum (1));
 
   if (NILP (value))
     {
@@ -622,13 +622,13 @@ init_category_once ()
 
   /* Now we are ready to set up this property, so we can
      create category tables.  */
-  Fput (Qcategory_table, Qchar_table_extra_slots, make_number (2));
+  Fput (Qcategory_table, Qchar_table_extra_slots, make_fixnum (2));
 
   Vstandard_category_table = Fmake_char_table (Qcategory_table, Qnil);
   /* Set a category set which contains nothing to the default.  */ 
   XCHAR_TABLE (Vstandard_category_table)->defalt = MAKE_CATEGORY_SET;
-  Fset_char_table_extra_slot (Vstandard_category_table, make_number (0),
-                             Fmake_vector (make_number (95), Qnil));
+  Fset_char_table_extra_slot (Vstandard_category_table, make_fixnum (0),
+                             Fmake_vector (make_fixnum (95), Qnil));
 }
 
 void