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/msdos.c b/src/msdos.c
index 6c0dfa0c46a..4f38b1de7d3 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -223,7 +223,7 @@ them.  This happens with wheeled mice on Windows 9X, for example.  */)
 {
   int n;
 
-  CHECK_NUMBER (nbuttons);
+  CHECK_FIXNUM (nbuttons);
   n = XINT (nbuttons);
   if (n < 2 || n > 3)
     xsignal2 (Qargs_out_of_range,
@@ -322,8 +322,8 @@ mouse_get_pos (struct frame **f, int insist, Lisp_Object *bar_window,
   *bar_window = Qnil;
   mouse_get_xy (&ix, &iy);
   *time = event_timestamp ();
-  *x = make_number (mouse_last_x = ix);
-  *y = make_number (mouse_last_y = iy);
+  *x = make_fixnum (mouse_last_x = ix);
+  *y = make_fixnum (mouse_last_y = iy);
 }
 
 static void
@@ -539,7 +539,7 @@ dos_set_window_size (int *rows, int *cols)
                                    (video_name, "screen-dimensions-%dx%d",
                                     *rows, *cols), Qnil));
 
-  if (INTEGERP (video_mode)
+  if (FIXNUMP (video_mode)
       && (video_mode_value = XINT (video_mode)) > 0)
     {
       regs.x.ax = video_mode_value;
@@ -742,7 +742,7 @@ IT_set_cursor_type (struct frame *f, Lisp_Object cursor_type)
       Lisp_Object bar_parms = XCDR (cursor_type);
       int width;
 
-      if (INTEGERP (bar_parms))
+      if (FIXNUMP (bar_parms))
         {
           /* Feature: negative WIDTH means cursor at the top
              of the character cell, zero means invisible cursor.  */
@@ -751,8 +751,8 @@ IT_set_cursor_type (struct frame *f, Lisp_Object cursor_type)
                                   width);
         }
       else if (CONSP (bar_parms)
-               && INTEGERP (XCAR (bar_parms))
-               && INTEGERP (XCDR (bar_parms)))
+               && FIXNUMP (XCAR (bar_parms))
+               && FIXNUMP (XCDR (bar_parms)))
         {
           int start_line = XINT (XCDR (bar_parms));
 
@@ -1321,7 +1321,7 @@ IT_frame_up_to_date (struct frame *f)
       if (EQ (BVAR (b,cursor_type), Qt))
         new_cursor = frame_desired_cursor;
       else if (NILP (BVAR (b, cursor_type))) /* nil means no cursor */
-        new_cursor = Fcons (Qbar, make_number (0));
+        new_cursor = Fcons (Qbar, make_fixnum (0));
       else
         new_cursor = BVAR (b, cursor_type);
     }
@@ -1791,7 +1791,7 @@ internal_terminal_init (void)
         }
 
       Vinitial_window_system = Qpc;
-      Vwindow_system_version = make_number (27); /* RE Emacs version */
+      Vwindow_system_version = make_fixnum (27); /* RE Emacs version */
       tty->terminal->type = output_msdos_raw;
 
       /* If Emacs was dumped on DOS/V machine, forget the stale VRAM
@@ -2423,11 +2423,11 @@ dos_rawgetc (void)
       sc = regs.h.ah;
 
       total_doskeys += 2;
-      ASET (recent_doskeys, recent_doskeys_index, make_number (c));
+      ASET (recent_doskeys, recent_doskeys_index, make_fixnum (c));
       recent_doskeys_index++;
       if (recent_doskeys_index == NUM_RECENT_DOSKEYS)
         recent_doskeys_index = 0;
-      ASET (recent_doskeys, recent_doskeys_index, make_number (sc));
+      ASET (recent_doskeys, recent_doskeys_index, make_fixnum (sc));
       recent_doskeys_index++;
       if (recent_doskeys_index == NUM_RECENT_DOSKEYS)
         recent_doskeys_index = 0;
@@ -2609,7 +2609,7 @@ dos_rawgetc (void)
       if (code == 0)
         continue;
 
-      if (!hlinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))
+      if (!hlinfo->mouse_face_hidden && FIXNUMP (Vmouse_highlight))
         {
           clear_mouse_face (hlinfo);
           hlinfo->mouse_face_hidden = 1;
@@ -2718,8 +2718,8 @@ dos_rawgetc (void)
                 event.code = button_num;
                 event.modifiers = dos_get_modifiers (0)
                   | (press ? down_modifier : up_modifier);
-                event.x = make_number (x);
-                event.y = make_number (y);
+                event.x = make_fixnum (x);
+                event.y = make_fixnum (y);
                 event.frame_or_window = selected_frame;
                 event.arg = Qnil;
                 event.timestamp = event_timestamp ();
@@ -4196,7 +4196,7 @@ msdos_fatal_signal (int sig)
 void
 syms_of_msdos (void)
 {
-  recent_doskeys = Fmake_vector (make_number (NUM_RECENT_DOSKEYS), Qnil);
+  recent_doskeys = Fmake_vector (make_fixnum (NUM_RECENT_DOSKEYS), Qnil);
   staticpro (&recent_doskeys);
 
 #ifndef HAVE_X_WINDOWS
@@ -4207,7 +4207,7 @@ syms_of_msdos (void)
   DEFVAR_LISP ("dos-unsupported-char-glyph", Vdos_unsupported_char_glyph,
                doc: /* Glyph to display instead of chars not supported by current codepage.
 This variable is used only by MS-DOS terminals.  */);
-  Vdos_unsupported_char_glyph = make_number ('\177');
+  Vdos_unsupported_char_glyph = make_fixnum ('\177');
 
 #endif