Rename integerp->fixnum, etc, in preparation for bignums

* src/json.c, src/keyboard.c, src/keyboard.h, src/keymap.c,
src/kqueue.c, src/lcms.c, src/lisp.h, src/lread.c, src/macros.c,
src/marker.c, src/menu.c, src/minibuf.c, src/msdos.c, src/print.c,
src/process.c, src/profiler.c, src/search.c, src/sound.c,
src/syntax.c, src/sysdep.c, src/term.c, src/terminal.c,
src/textprop.c, src/undo.c, src/w16select.c, src/w32.c,
src/w32console.c, src/w32cygwinx.c, src/w32fns.c, src/w32font.c,
src/w32inevt.c, src/w32proc.c, src/w32select.c, src/w32term.c,
src/w32uniscribe.c, src/widget.c, src/window.c, src/xdisp.c,
src/xfaces.c, src/xfns.c, src/xfont.c, src/xftfont.c, src/xmenu.c,
src/xrdb.c, src/xselect.c, src/xterm.c, src/xwidget.c: Rename
INTEGERP->FIXNUM, make_number->make_fixnum, CHECK_NUMBER->CHECK_FIXNUM,
make_natnum->make_fixed_natum, NUMBERP->FIXED_OR_FLOATP,
NATNUMP->FIXNATP, CHECK_NATNUM->CHECK_FIXNAT.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/cmds.c b/src/cmds.c
index 96b712ed6d2..857197cf9b1 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -35,9 +35,9 @@ DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0,
        doc: /* Return buffer position N characters after (before if N negative) point.  */)
   (Lisp_Object n)
 {
-  CHECK_NUMBER (n);
+  CHECK_FIXNUM (n);
 
-  return make_number (PT + XINT (n));
+  return make_fixnum (PT + XINT (n));
 }
 
 /* Add N to point; or subtract N if FORWARD is false.  N defaults to 1.
@@ -56,7 +56,7 @@ move_point (Lisp_Object n, bool forward)
   if (NILP (n))
     XSETFASTINT (n, 1);
   else
-    CHECK_NUMBER (n);
+    CHECK_FIXNUM (n);
 
   new_point = PT + (forward ? XINT (n) : - XINT (n));
 
@@ -127,7 +127,7 @@ go to its beginning.  */)
     count = 1;
   else
     {
-      CHECK_NUMBER (n);
+      CHECK_FIXNUM (n);
       count = XINT (n);
     }
 
@@ -142,7 +142,7 @@ go to its beginning.  */)
               && (FETCH_BYTE (PT_BYTE - 1) != '\n'))))
     shortage--;
 
-  return make_number (count <= 0 ? - shortage : shortage);
+  return make_fixnum (count <= 0 ? - shortage : shortage);
 }
 
 DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, 0, 1, "^p",
@@ -162,7 +162,7 @@ instead.  For instance, `(forward-line 0)' does the same thing as
   if (NILP (n))
     XSETFASTINT (n, 1);
   else
-    CHECK_NUMBER (n);
+    CHECK_FIXNUM (n);
 
   SET_PT (XINT (Fline_beginning_position (n)));
 
@@ -187,7 +187,7 @@ to t.  */)
   if (NILP (n))
     XSETFASTINT (n, 1);
   else
-    CHECK_NUMBER (n);
+    CHECK_FIXNUM (n);
 
   while (1)
     {
@@ -210,7 +210,7 @@ to t.  */)
         /* If we skipped something intangible
            and now we're not really at eol,
            keep going.  */
-        n = make_number (1);
+        n = make_fixnum (1);
       else
         break;
     }
@@ -230,7 +230,7 @@ because it respects values of `delete-active-region' and `overwrite-mode'.  */)
 {
   EMACS_INT pos;
 
-  CHECK_NUMBER (n);
+  CHECK_FIXNUM (n);
 
   if (eabs (XINT (n)) < 2)
     call0 (Qundo_auto_amalgamate);
@@ -274,7 +274,7 @@ a non-nil value for the inserted character.  At the end, it runs
 `post-self-insert-hook'.  */)
   (Lisp_Object n)
 {
-  CHECK_NUMBER (n);
+  CHECK_FIXNUM (n);
 
   if (XINT (n) < 0)
     error ("Negative repetition argument %"pI"d", XINT (n));
@@ -360,7 +360,7 @@ internal_self_insert (int c, EMACS_INT n)
       if (EQ (overwrite, Qoverwrite_mode_binary))
         chars_to_delete = min (n, PTRDIFF_MAX);
       else if (c != '\n' && c2 != '\n'
-               && (cwidth = XFASTINT (Fchar_width (make_number (c)))) != 0)
+               && (cwidth = XFASTINT (Fchar_width (make_fixnum (c)))) != 0)
         {
           ptrdiff_t pos = PT;
           ptrdiff_t pos_byte = PT_BYTE;
@@ -378,7 +378,7 @@ internal_self_insert (int c, EMACS_INT n)
                  character.  In that case, the new point is set after
                  that character.  */
               ptrdiff_t actual_clm
-                = XFASTINT (Fmove_to_column (make_number (target_clm), Qnil));
+                = XFASTINT (Fmove_to_column (make_fixnum (target_clm), Qnil));
 
               chars_to_delete = PT - pos;
 
@@ -439,18 +439,18 @@ internal_self_insert (int c, EMACS_INT n)
       int mc = ((NILP (BVAR (current_buffer, enable_multibyte_characters))
                  && SINGLE_BYTE_CHAR_P (c))
                 ? UNIBYTE_TO_CHAR (c) : c);
-      Lisp_Object string = Fmake_string (make_number (n), make_number (mc),
+      Lisp_Object string = Fmake_string (make_fixnum (n), make_fixnum (mc),
                                          Qnil);
 
       if (spaces_to_insert)
         {
-          tem = Fmake_string (make_number (spaces_to_insert),
-                              make_number (' '), Qnil);
+          tem = Fmake_string (make_fixnum (spaces_to_insert),
+                              make_fixnum (' '), Qnil);
           string = concat2 (string, tem);
         }
 
       replace_range (PT, PT + chars_to_delete, string, 1, 1, 1, 0);
-      Fforward_char (make_number (n));
+      Fforward_char (make_fixnum (n));
     }
   else if (n > 1)
     {