Mechanically change INT to FIXNUM in our sources.
authorAidan Kehoe <kehoea@parhasard.net>
Sun, 09 Oct 2011 09:51:57 +0100
changeset 558156144c8593a8
parent 5580 a0e81357194e
child 5582 873d7425c1ad
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.
man/ChangeLog
man/internals/internals.texi
modules/ChangeLog
modules/canna/canna_api.c
modules/ldap/eldap.c
modules/postgresql/postgresql.c
src/ChangeLog
src/EmacsFrame.c
src/README
src/abbrev.c
src/alloc.c
src/buffer.c
src/buffer.h
src/bytecode.c
src/callint.c
src/casefiddle.c
src/chartab.c
src/cmdloop.c
src/cmds.c
src/console-gtk.c
src/console-msw.c
src/console-tty.c
src/console-x.c
src/console.c
src/data.c
src/database.c
src/debug.c
src/device-gtk.c
src/device-msw.c
src/device-tty.c
src/device-x.c
src/device.c
src/dialog-msw.c
src/dialog-x.c
src/dired.c
src/doc.c
src/doprnt.c
src/editfns.c
src/elhash.c
src/emacs.c
src/emodules.c
src/eval.c
src/event-Xt.c
src/event-msw.c
src/event-stream.c
src/event-xlike-inc.c
src/events.c
src/extents.c
src/file-coding.c
src/fileio.c
src/floatfns.c
src/fns.c
src/font-lock.c
src/font-mgr.c
src/fontcolor-gtk.c
src/fontcolor-msw.c
src/fontcolor-x.c
src/fontcolor.c
src/frame-gtk.c
src/frame-impl.h
src/frame-msw.c
src/frame-tty.c
src/frame-x.c
src/frame.c
src/free-hook.c
src/glyphs-eimage.c
src/glyphs-gtk.c
src/glyphs-msw.c
src/glyphs-widget.c
src/glyphs-x.c
src/glyphs.c
src/gpmevent.c
src/gtk-glue.c
src/gtk-xemacs.c
src/gui-gtk.c
src/gui-msw.c
src/gui-x.c
src/gui.c
src/gutter.c
src/gutter.h
src/indent.c
src/insdel.c
src/intl-win32.c
src/keymap.c
src/line-number.c
src/lisp-disunion.h
src/lisp-union.h
src/lisp.h
src/lread.c
src/lstream.c
src/macros.c
src/marker.c
src/mc-alloc.c
src/menubar-msw.c
src/menubar.c
src/minibuf.c
src/mule-ccl.c
src/mule-charset.c
src/mule-coding.c
src/mule-wnnfns.c
src/number.c
src/number.h
src/print.c
src/process-nt.c
src/process-unix.c
src/process.c
src/profile.c
src/ralloc.c
src/rangetab.c
src/redisplay-msw.c
src/redisplay-output.c
src/redisplay-xlike-inc.c
src/redisplay.c
src/scrollbar-gtk.c
src/scrollbar-msw.c
src/scrollbar-x.c
src/scrollbar.c
src/search.c
src/select-gtk.c
src/select-msw.c
src/select-x.c
src/select-xlike-inc.c
src/select.c
src/sgiplay.c
src/sound.c
src/specifier.c
src/specifier.h
src/symbols.c
src/syntax.c
src/syntax.h
src/sysdep.c
src/tests.c
src/text.c
src/toolbar-msw.c
src/toolbar-xlike.c
src/toolbar.c
src/tooltalk.c
src/tooltalk.h
src/ui-byhand.c
src/ui-gtk.c
src/undo.c
src/unicode.c
src/win32.c
src/window-impl.h
src/window.c
src/xemacs.def.in.in
     1.1 --- a/man/ChangeLog	Sat Oct 08 12:26:09 2011 +0100
     1.2 +++ b/man/ChangeLog	Sun Oct 09 09:51:57 2011 +0100
     1.3 @@ -1,3 +1,10 @@
     1.4 +2011-10-09  Aidan Kehoe  <kehoea@parhasard.net>
     1.5 +
     1.6 +	* internals/internals.texi (How Lisp Objects Are Represented in C):
     1.7 +	* internals/internals.texi (Integers and Characters):
     1.8 +	Mechanically change INT to FIXNUM, where the usage describes non-bignum
     1.9 +	Lisp integers.
    1.10 +
    1.11  2011-09-07  Aidan Kehoe  <kehoea@parhasard.net>
    1.12  
    1.13  	* cl.texi (Function Bindings):
     2.1 --- a/man/internals/internals.texi	Sat Oct 08 12:26:09 2011 +0100
     2.2 +++ b/man/internals/internals.texi	Sun Oct 09 09:51:57 2011 +0100
     2.3 @@ -7895,9 +7895,9 @@
     2.4  the @code{--use-union-type} option to @code{configure}.
     2.5  
     2.6  Various macros are used to convert between Lisp_Objects and the
     2.7 -corresponding C type.  Macros of the form @code{XINT()}, @code{XCHAR()},
     2.8 +corresponding C type.  Macros of the form @code{XFIXNUM()}, @code{XCHAR()},
     2.9  @code{XSTRING()}, @code{XSYMBOL()}, do any required bit shifting and/or
    2.10 -masking and cast it to the appropriate type.  @code{XINT()} needs to be
    2.11 +masking and cast it to the appropriate type.  @code{XFIXNUM()} needs to be
    2.12  a bit tricky so that negative numbers are properly sign-extended.  Since
    2.13  integers are stored left-shifted, if the right-shift operator does an
    2.14  arithmetic shift (i.e. it leaves the most-significant bit as-is rather
    2.15 @@ -7919,7 +7919,7 @@
    2.16  than just used in an expression.  The reason for this is that standard C
    2.17  doesn't let you ``construct'' a structure (but GCC does).  Granted, this
    2.18  sometimes isn't too convenient; for the case of integers, at least, you
    2.19 -can use the function @code{make_int()}, which constructs and
    2.20 +can use the function @code{make_fixnum()}, which constructs and
    2.21  @emph{returns} an integer Lisp object.  Note that the
    2.22  @code{XSET@var{TYPE}()} macros are also affected by
    2.23  @code{ERROR_CHECK_TYPES} and make sure that the structure is of the
    2.24 @@ -8736,7 +8736,7 @@
    2.25  @cindex characters, integers and
    2.26  
    2.27  Integer and character Lisp objects are created from integers using the
    2.28 -functions @code{make_int()} and @code{make_char()}. (These are actually
    2.29 +functions @code{make_fixnum()} and @code{make_char()}. (These are actually
    2.30  macros on most systems.)  These functions basically just do some moving
    2.31  of bits around, since the integral value of the object is stored
    2.32  directly in the @code{Lisp_Object}.
     3.1 --- a/modules/ChangeLog	Sat Oct 08 12:26:09 2011 +0100
     3.2 +++ b/modules/ChangeLog	Sun Oct 09 09:51:57 2011 +0100
     3.3 @@ -1,3 +1,44 @@
     3.4 +2011-10-09  Aidan Kehoe  <kehoea@parhasard.net>
     3.5 +
     3.6 +	* postgresql/postgresql.c (Fpq_conn_defaults):
     3.7 +	* postgresql/postgresql.c (Fpq_client_encoding):
     3.8 +	* postgresql/postgresql.c (Fpq_set_client_encoding):
     3.9 +	* postgresql/postgresql.c (Fpq_pgconn):
    3.10 +	* postgresql/postgresql.c (Fpq_ntuples):
    3.11 +	* postgresql/postgresql.c (Fpq_nfields):
    3.12 +	* postgresql/postgresql.c (Fpq_fname):
    3.13 +	* postgresql/postgresql.c (Fpq_fnumber):
    3.14 +	* postgresql/postgresql.c (Fpq_ftype):
    3.15 +	* postgresql/postgresql.c (Fpq_fsize):
    3.16 +	* postgresql/postgresql.c (Fpq_fmod):
    3.17 +	* postgresql/postgresql.c (Fpq_get_value):
    3.18 +	* postgresql/postgresql.c (Fpq_get_length):
    3.19 +	* postgresql/postgresql.c (Fpq_get_is_null):
    3.20 +	* postgresql/postgresql.c (Fpq_oid_value):
    3.21 +	* postgresql/postgresql.c (Fpq_set_nonblocking):
    3.22 +	* postgresql/postgresql.c (Fpq_flush):
    3.23 +	* postgresql/postgresql.c (Fpq_notifies):
    3.24 +	* postgresql/postgresql.c (Fpq_env_2_encoding):
    3.25 +	* postgresql/postgresql.c (Fpq_lo_import):
    3.26 +	* postgresql/postgresql.c (Fpq_lo_export):
    3.27 +	* postgresql/postgresql.c (Fpq_get_line):
    3.28 +	* postgresql/postgresql.c (Fpq_get_line_async):
    3.29 +	* postgresql/postgresql.c (init_postgresql_from_environment):
    3.30 +	* ldap/eldap.c (Fldap_open):
    3.31 +	* ldap/eldap.c (Fldap_search_basic):
    3.32 +	* ldap/eldap.c (Fldap_add):
    3.33 +	* ldap/eldap.c (Fldap_modify):
    3.34 +	* canna/canna_api.c (storeResults):
    3.35 +	* canna/canna_api.c (Fcanna_initialize):
    3.36 +	* canna/canna_api.c (Fcanna_set_width):
    3.37 +	* canna/canna_api.c (Fcanna_change_mode):
    3.38 +	* canna/canna_api.c (Fcanna_do_function):
    3.39 +	* canna/canna_api.c (Fcanna_henkan_next):
    3.40 +	* canna/canna_api.c (Fcanna_bunsetu_henkou):
    3.41 +	* canna/canna_api.c (Fcanna_henkan_kakutei):
    3.42 +	Mechanically change INT to FIXNUM, where the usage describes non-bignum
    3.43 +	Lisp integers. See the src/ChangeLog entry for more details.
    3.44 +
    3.45  2011-05-20  Jerry James  <james@xemacs.org>
    3.46  
    3.47  	* base64/Makefile: Default DESTDIR to the empty string, and use it in
     4.1 --- a/modules/canna/canna_api.c	Sat Oct 08 12:26:09 2011 +0100
     4.2 +++ b/modules/canna/canna_api.c	Sun Oct 09 09:51:57 2011 +0100
     4.3 @@ -237,7 +237,7 @@
     4.4      {
     4.5        /* 確定した文字列 (the confirmed string) */
     4.6        Vcanna_kakutei_string = make_euc_string (buf, len);
     4.7 -      val = make_int (len);
     4.8 +      val = make_fixnum (len);
     4.9        /* 確定した文字列の読みの情報...
    4.10  	 (info about the reading of the confirmed string) */
    4.11        Vcanna_kakutei_yomi = Vcanna_kakutei_romaji = Qnil;
    4.12 @@ -375,8 +375,8 @@
    4.13      }
    4.14    else
    4.15      {
    4.16 -      CHECK_INT (num);
    4.17 -      kugiri = (XINT (num) == 1) ? (char *) 1 : (char *) 0;
    4.18 +      CHECK_FIXNUM (num);
    4.19 +      kugiri = (XFIXNUM (num) == 1) ? (char *) 1 : (char *) 0;
    4.20      }
    4.21  
    4.22    if (NILP (server))
    4.23 @@ -506,9 +506,9 @@
    4.24  */
    4.25         (num))
    4.26  {
    4.27 -  CHECK_INT (num);
    4.28 +  CHECK_FIXNUM (num);
    4.29  
    4.30 -  jrKanjiControl (0, KC_SETWIDTH,  (char *) XINT (num));
    4.31 +  jrKanjiControl (0, KC_SETWIDTH,  (char *) XFIXNUM (num));
    4.32    return Qnil;
    4.33  }
    4.34  
    4.35 @@ -520,12 +520,12 @@
    4.36    jrKanjiStatusWithValue ksv;
    4.37    jrKanjiStatus ks;
    4.38  
    4.39 -  CHECK_INT (num);
    4.40 +  CHECK_FIXNUM (num);
    4.41  
    4.42    ksv.buffer = (unsigned char *) key_buffer;
    4.43    ksv.bytes_buffer = KEYTOSTRSIZE;
    4.44    ksv.ks = &ks;
    4.45 -  ksv.val = XINT (num);
    4.46 +  ksv.val = XFIXNUM (num);
    4.47    jrKanjiControl (0, KC_CHANGEMODE,  (char *)&ksv);
    4.48    return storeResults (key_buffer, ksv.val, ksv.ks);
    4.49  }
    4.50 @@ -596,7 +596,7 @@
    4.51    jrKanjiStatusWithValue ksv;
    4.52    jrKanjiStatus ks;
    4.53  
    4.54 -  CHECK_INT (num);
    4.55 +  CHECK_FIXNUM (num);
    4.56  
    4.57    if (NILP (ch))
    4.58      {
    4.59 @@ -611,7 +611,7 @@
    4.60    ksv.buffer = (unsigned char *) key_buffer;
    4.61    ksv.bytes_buffer = KEYTOSTRSIZE;
    4.62    ksv.ks = &ks;
    4.63 -  ksv.val = XINT (num);
    4.64 +  ksv.val = XFIXNUM (num);
    4.65    jrKanjiControl (0, KC_DO, (char *) &ksv);
    4.66    return storeResults (key_buffer, ksv.val, ksv.ks);
    4.67  }
    4.68 @@ -762,12 +762,12 @@
    4.69    UExtbyte *p, RkBuf[RKBUFSIZE];
    4.70    Lisp_Object res = Qnil;
    4.71  
    4.72 -  CHECK_INT (bunsetsu);
    4.73 +  CHECK_FIXNUM (bunsetsu);
    4.74    if (confirmContext () == 0)
    4.75      {
    4.76        return Qnil;
    4.77      }
    4.78 -  RkGoTo (IRCP_context, XINT (bunsetsu));
    4.79 +  RkGoTo (IRCP_context, XFIXNUM (bunsetsu));
    4.80    len = RkGetKanjiList (IRCP_context, RkBuf, RKBUFSIZE);
    4.81    p = RkBuf;
    4.82    for (i = 0 ; i < len ; i++)
    4.83 @@ -793,16 +793,16 @@
    4.84  {
    4.85    int nbun, len;
    4.86  
    4.87 -  CHECK_INT (bunsetsu);
    4.88 -  CHECK_INT (bunlen);
    4.89 +  CHECK_FIXNUM (bunsetsu);
    4.90 +  CHECK_FIXNUM (bunlen);
    4.91  
    4.92 -  nbun = XINT (bunsetsu);
    4.93 +  nbun = XFIXNUM (bunsetsu);
    4.94    if (confirmContext () == 0)
    4.95      {
    4.96        return Qnil;
    4.97      }
    4.98    RkGoTo (IRCP_context, nbun);
    4.99 -  len = byteLen (nbun, XINT (bunlen));
   4.100 +  len = byteLen (nbun, XFIXNUM (bunlen));
   4.101    return kanjiYomiList (IRCP_context, RkResize (IRCP_context, len));
   4.102  }
   4.103  
   4.104 @@ -817,10 +817,10 @@
   4.105      {
   4.106        return Qnil;
   4.107      }
   4.108 -  nbun = XINT(bun);
   4.109 +  nbun = XFIXNUM(bun);
   4.110    RkGoTo (IRCP_context, nbun);
   4.111  
   4.112 -  nkouho = XINT(kouho);
   4.113 +  nkouho = XFIXNUM(kouho);
   4.114    RkXfer (IRCP_context, nkouho);
   4.115    return Qt;
   4.116  }
     5.1 --- a/modules/ldap/eldap.c	Sat Oct 08 12:26:09 2011 +0100
     5.2 +++ b/modules/ldap/eldap.c	Sun Oct 09 09:51:57 2011 +0100
     5.3 @@ -234,8 +234,8 @@
     5.4  	/* TCP Port */
     5.5  	if (EQ (keyword, Qport))
     5.6  	  {
     5.7 -	    CHECK_INT (value);
     5.8 -	    ldap_port = XINT (value);
     5.9 +	    CHECK_FIXNUM (value);
    5.10 +	    ldap_port = XFIXNUM (value);
    5.11  	  }
    5.12  	/* Authentication method */
    5.13  	if (EQ (keyword, Qauth))
    5.14 @@ -282,14 +282,14 @@
    5.15  	/* Timelimit */
    5.16  	else if (EQ (keyword, Qtimelimit))
    5.17  	  {
    5.18 -	    CHECK_INT (value);
    5.19 -	    ldap_timelimit = XINT (value);
    5.20 +	    CHECK_FIXNUM (value);
    5.21 +	    ldap_timelimit = XFIXNUM (value);
    5.22  	  }
    5.23  	/* Sizelimit */
    5.24  	else if (EQ (keyword, Qsizelimit))
    5.25  	  {
    5.26 -	    CHECK_INT (value);
    5.27 -	    ldap_sizelimit = XINT (value);
    5.28 +	    CHECK_FIXNUM (value);
    5.29 +	    ldap_sizelimit = XFIXNUM (value);
    5.30  	  }
    5.31        }
    5.32    }
    5.33 @@ -473,7 +473,7 @@
    5.34    if (!NILP (attrs))
    5.35      {
    5.36        CHECK_CONS (attrs);
    5.37 -      ldap_attributes = alloca_array (char *, 1 + XINT (Flength (attrs)));
    5.38 +      ldap_attributes = alloca_array (char *, 1 + XFIXNUM (Flength (attrs)));
    5.39  
    5.40        i = 0;
    5.41        {
    5.42 @@ -628,7 +628,7 @@
    5.43      invalid_operation ("Cannot add void entry", entry);
    5.44  
    5.45    /* Build the ldap_mods array */
    5.46 -  len = (Elemcount) XINT (Flength (entry));
    5.47 +  len = (Elemcount) XFIXNUM (Flength (entry));
    5.48    ldap_mods = alloca_array (LDAPMod, len);
    5.49    ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len);
    5.50    i = 0;
    5.51 @@ -645,7 +645,7 @@
    5.52  	values = XCDR (current);
    5.53  	if (CONSP (values))
    5.54  	  {
    5.55 -	    len = (Elemcount) XINT (Flength (values));
    5.56 +	    len = (Elemcount) XFIXNUM (Flength (values));
    5.57  	    bervals = alloca_array (struct berval, len);
    5.58  	    ldap_mods[i].mod_vals.modv_bvals =
    5.59  	      alloca_array (struct berval *, 1 + len);
    5.60 @@ -724,7 +724,7 @@
    5.61      return Qnil;
    5.62  
    5.63    /* Build the ldap_mods array */
    5.64 -  len = (Elemcount) XINT (Flength (mods));
    5.65 +  len = (Elemcount) XFIXNUM (Flength (mods));
    5.66    ldap_mods = alloca_array (LDAPMod, len);
    5.67    ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len);
    5.68    i = 0;
    5.69 @@ -751,7 +751,7 @@
    5.70  	ldap_mods[i].mod_type =
    5.71  	  LISP_STRING_TO_EXTERNAL (XCAR (current), Qnative);
    5.72  	values = XCDR (current);
    5.73 -	len = (Elemcount) XINT (Flength (values));
    5.74 +	len = (Elemcount) XFIXNUM (Flength (values));
    5.75  	bervals = alloca_array (struct berval, len);
    5.76  	ldap_mods[i].mod_vals.modv_bvals =
    5.77  	  alloca_array (struct berval *, 1 + len);
     6.1 --- a/modules/postgresql/postgresql.c	Sat Oct 08 12:26:09 2011 +0100
     6.2 +++ b/modules/postgresql/postgresql.c	Sun Oct 09 09:51:57 2011 +0100
     6.3 @@ -530,7 +530,7 @@
     6.4  			  build_extstring (pcio[0].val, PG_OS_CODING)),
     6.5  		   list3 (build_extstring (pcio[0].label, PG_OS_CODING),
     6.6  			  build_extstring (pcio[0].dispchar, PG_OS_CODING),
     6.7 -			  make_int (pcio[0].dispsize))));
     6.8 +			  make_fixnum (pcio[0].dispsize))));
     6.9  
    6.10    for (i = 1; pcio[i].keyword; i++)
    6.11      {
    6.12 @@ -541,7 +541,7 @@
    6.13  			      build_extstring (pcio[i].val, PG_OS_CODING)),
    6.14  		       list3 (build_extstring (pcio[i].label, PG_OS_CODING),
    6.15  			      build_extstring (pcio[i].dispchar, PG_OS_CODING),
    6.16 -			      make_int (pcio[i].dispsize))));
    6.17 +			      make_fixnum (pcio[i].dispsize))));
    6.18        {
    6.19  	Lisp_Object args[2];
    6.20  	args[0] = temp;
    6.21 @@ -670,7 +670,7 @@
    6.22    P = (XPGCONN (conn))->pgconn;
    6.23    CHECK_LIVE_CONNECTION (P);
    6.24  
    6.25 -  return make_int (PQclientEncoding (P));
    6.26 +  return make_fixnum (PQclientEncoding (P));
    6.27  }
    6.28  
    6.29  DEFUN ("pq-set-client-encoding", Fpq_set_client_encoding, 2, 2, 0, /*
    6.30 @@ -694,7 +694,7 @@
    6.31    if ((rc = PQsetClientEncoding (P, c_encoding)) < 0)
    6.32      signal_error (Qinvalid_argument, "bad encoding", Qunbound);
    6.33    else
    6.34 -    return make_int (rc);
    6.35 +    return make_fixnum (rc);
    6.36  }
    6.37  
    6.38  #endif
    6.39 @@ -911,9 +911,9 @@
    6.40           char *PQport(PGconn *conn)
    6.41         */
    6.42        if ((p = PQport(P)))
    6.43 -	return make_int(atoi(p));
    6.44 +	return make_fixnum(atoi(p));
    6.45        else
    6.46 -        return make_int(-1);
    6.47 +        return make_fixnum(-1);
    6.48      }
    6.49    else if (EQ (field, Qpqtty))
    6.50      /* PQtty Returns the debug tty of the connection.
    6.51 @@ -959,7 +959,7 @@
    6.52         this connection.
    6.53         int PQbackendPID(PGconn *conn);
    6.54       */
    6.55 -    return make_int (PQbackendPID(P));
    6.56 +    return make_fixnum (PQbackendPID(P));
    6.57    else
    6.58      signal_error (Qinvalid_argument, "bad PGconn accessor", Qunbound);
    6.59  }
    6.60 @@ -1159,7 +1159,7 @@
    6.61    R = (XPGRESULT (result))->pgresult;
    6.62    PUKE_IF_NULL (R);
    6.63  
    6.64 -  return make_int (PQntuples (R));
    6.65 +  return make_fixnum (PQntuples (R));
    6.66  }
    6.67  
    6.68  DEFUN ("pq-nfields", Fpq_nfields, 1, 1, 0, /*
    6.69 @@ -1173,7 +1173,7 @@
    6.70    R = (XPGRESULT (result))->pgresult;
    6.71    PUKE_IF_NULL (R);
    6.72  
    6.73 -  return make_int (PQnfields (R));
    6.74 +  return make_fixnum (PQnfields (R));
    6.75  }
    6.76  
    6.77  DEFUN ("pq-binary-tuples", Fpq_binary_tuples, 1, 1, 0, /*
    6.78 @@ -1199,11 +1199,11 @@
    6.79    PGresult *R;
    6.80  
    6.81    CHECK_PGRESULT (result);
    6.82 -  CHECK_INT (field_index);
    6.83 +  CHECK_FIXNUM (field_index);
    6.84    R = (XPGRESULT (result))->pgresult;
    6.85    PUKE_IF_NULL (R);
    6.86  
    6.87 -  return build_extstring (PQfname (R, XINT (field_index)), PG_OS_CODING);
    6.88 +  return build_extstring (PQfname (R, XFIXNUM (field_index)), PG_OS_CODING);
    6.89  }
    6.90  
    6.91  DEFUN ("pq-fnumber", Fpq_fnumber, 2, 2, 0, /*
    6.92 @@ -1222,7 +1222,7 @@
    6.93    TO_EXTERNAL_FORMAT (LISP_STRING, field_name,
    6.94  		      C_STRING_ALLOCA, c_field_name, Qnative);
    6.95  
    6.96 -  return make_int (PQfnumber (R, c_field_name));
    6.97 +  return make_fixnum (PQfnumber (R, c_field_name));
    6.98  }
    6.99  
   6.100  DEFUN ("pq-ftype", Fpq_ftype, 2, 2, 0, /*
   6.101 @@ -1235,11 +1235,11 @@
   6.102    PGresult *R;
   6.103  
   6.104    CHECK_PGRESULT (result);
   6.105 -  CHECK_INT (field_num);
   6.106 +  CHECK_FIXNUM (field_num);
   6.107    R = (XPGRESULT (result))->pgresult;
   6.108    PUKE_IF_NULL (R);
   6.109  
   6.110 -  return make_int (PQftype (R, XINT (field_num)));
   6.111 +  return make_fixnum (PQftype (R, XFIXNUM (field_num)));
   6.112  }
   6.113  
   6.114  DEFUN ("pq-fsize", Fpq_fsize, 2, 2, 0, /*
   6.115 @@ -1251,11 +1251,11 @@
   6.116    PGresult *R;
   6.117  
   6.118    CHECK_PGRESULT (result);
   6.119 -  CHECK_INT (field_index);
   6.120 +  CHECK_FIXNUM (field_index);
   6.121    R = (XPGRESULT (result))->pgresult;
   6.122    PUKE_IF_NULL (R);
   6.123  
   6.124 -  return make_int (PQftype (R, XINT (field_index)));
   6.125 +  return make_fixnum (PQftype (R, XFIXNUM (field_index)));
   6.126  }
   6.127  
   6.128  DEFUN ("pq-fmod", Fpq_fmod, 2, 2, 0, /*
   6.129 @@ -1267,11 +1267,11 @@
   6.130    PGresult *R;
   6.131  
   6.132    CHECK_PGRESULT (result);
   6.133 -  CHECK_INT (field_index);
   6.134 +  CHECK_FIXNUM (field_index);
   6.135    R = (XPGRESULT (result))->pgresult;
   6.136    PUKE_IF_NULL (R);
   6.137  
   6.138 -  return make_int (PQfmod (R, XINT (field_index)));
   6.139 +  return make_fixnum (PQfmod (R, XFIXNUM (field_index)));
   6.140  }
   6.141  
   6.142  DEFUN ("pq-get-value", Fpq_get_value, 3, 3, 0, /*
   6.143 @@ -1283,12 +1283,12 @@
   6.144    PGresult *R;
   6.145  
   6.146    CHECK_PGRESULT (result);
   6.147 -  CHECK_INT (tup_num);
   6.148 -  CHECK_INT (field_num);
   6.149 +  CHECK_FIXNUM (tup_num);
   6.150 +  CHECK_FIXNUM (field_num);
   6.151    R = (XPGRESULT (result))->pgresult;
   6.152    PUKE_IF_NULL (R);
   6.153  
   6.154 -  return build_extstring (PQgetvalue (R, XINT (tup_num), XINT (field_num)),
   6.155 +  return build_extstring (PQgetvalue (R, XFIXNUM (tup_num), XFIXNUM (field_num)),
   6.156  			   PG_OS_CODING);
   6.157  }
   6.158  
   6.159 @@ -1303,12 +1303,12 @@
   6.160    PGresult *R;
   6.161  
   6.162    CHECK_PGRESULT (result);
   6.163 -  CHECK_INT (tup_num);
   6.164 -  CHECK_INT (field_num);
   6.165 +  CHECK_FIXNUM (tup_num);
   6.166 +  CHECK_FIXNUM (field_num);
   6.167    R = (XPGRESULT (result))->pgresult;
   6.168    PUKE_IF_NULL (R);
   6.169  
   6.170 -  return make_int (PQgetlength (R, XINT (tup_num), XINT (field_num)));
   6.171 +  return make_fixnum (PQgetlength (R, XFIXNUM (tup_num), XFIXNUM (field_num)));
   6.172  }
   6.173  
   6.174  DEFUN ("pq-get-is-null", Fpq_get_is_null, 3, 3, 0, /*
   6.175 @@ -1319,12 +1319,12 @@
   6.176    PGresult *R;
   6.177  
   6.178    CHECK_PGRESULT (result);
   6.179 -  CHECK_INT (tup_num);
   6.180 -  CHECK_INT (field_num);
   6.181 +  CHECK_FIXNUM (tup_num);
   6.182 +  CHECK_FIXNUM (field_num);
   6.183    R = (XPGRESULT (result))->pgresult;
   6.184    PUKE_IF_NULL (R);
   6.185  
   6.186 -  return PQgetisnull (R, XINT (tup_num), XINT (field_num)) ? Qt : Qnil;
   6.187 +  return PQgetisnull (R, XFIXNUM (tup_num), XFIXNUM (field_num)) ? Qt : Qnil;
   6.188  }
   6.189  
   6.190  DEFUN ("pq-cmd-status", Fpq_cmd_status, 1, 1, 0, /*
   6.191 @@ -1367,10 +1367,10 @@
   6.192    PUKE_IF_NULL (R);
   6.193  
   6.194  #ifdef HAVE_POSTGRESQLV7
   6.195 -  return make_int (PQoidValue (R));
   6.196 +  return make_fixnum (PQoidValue (R));
   6.197  #else
   6.198    /* Use the old interface */
   6.199 -  return make_int (atoi (PQoidStatus (R)));
   6.200 +  return make_fixnum (atoi (PQoidStatus (R)));
   6.201  #endif
   6.202  }
   6.203  
   6.204 @@ -1390,7 +1390,7 @@
   6.205    P = (XPGCONN (conn))->pgconn;
   6.206    CHECK_LIVE_CONNECTION (P);
   6.207  
   6.208 -  return make_int (PQsetnonblocking (P, !NILP (arg)));
   6.209 +  return make_fixnum (PQsetnonblocking (P, !NILP (arg)));
   6.210  }
   6.211  
   6.212  DEFUN ("pq-is-nonblocking", Fpq_is_nonblocking, 1, 1, 0, /*
   6.213 @@ -1418,7 +1418,7 @@
   6.214    P = (XPGCONN (conn))->pgconn;
   6.215    CHECK_LIVE_CONNECTION (P);
   6.216  
   6.217 -  return make_int (PQflush (P));
   6.218 +  return make_fixnum (PQflush (P));
   6.219  }
   6.220  #endif
   6.221  
   6.222 @@ -1446,7 +1446,7 @@
   6.223    {
   6.224      Lisp_Object temp;
   6.225  
   6.226 -    temp = list2 (build_extstring (PGN->relname, PG_OS_CODING), make_int (PGN->be_pid));
   6.227 +    temp = list2 (build_extstring (PGN->relname, PG_OS_CODING), make_fixnum (PGN->be_pid));
   6.228      free ((void *)PGN);
   6.229      return temp;
   6.230    }
   6.231 @@ -1459,7 +1459,7 @@
   6.232  */
   6.233         ())
   6.234  {
   6.235 -  return make_int (PQenv2encoding ());
   6.236 +  return make_fixnum (PQenv2encoding ());
   6.237  }
   6.238  #endif /* MULE */
   6.239  
   6.240 @@ -1478,7 +1478,7 @@
   6.241  
   6.242    LISP_PATHNAME_CONVERT_OUT (filename, c_filename);
   6.243  
   6.244 -  return make_int ((int)lo_import (P, c_filename));
   6.245 +  return make_fixnum ((int)lo_import (P, c_filename));
   6.246  }
   6.247  
   6.248  DEFUN ("pq-lo-export", Fpq_lo_export, 3, 3, 0, /*
   6.249 @@ -1489,7 +1489,7 @@
   6.250    char *c_filename;
   6.251  
   6.252    CHECK_PGCONN (conn);
   6.253 -  CHECK_INT (oid);
   6.254 +  CHECK_FIXNUM (oid);
   6.255    CHECK_STRING (filename);
   6.256  
   6.257    P = (XPGCONN (conn))->pgconn;
   6.258 @@ -1497,7 +1497,7 @@
   6.259  
   6.260    LISP_PATHNAME_CONVERT_OUT (filename, c_filename);
   6.261  
   6.262 -  return make_int ((int)lo_export (P, XINT (oid), c_filename));
   6.263 +  return make_fixnum ((int)lo_export (P, XFIXNUM (oid), c_filename));
   6.264  }
   6.265  
   6.266  DEFUN ("pq-make-empty-pgresult", Fpq_make_empty_pgresult, 2, 2, 0, /*
   6.267 @@ -1557,7 +1557,7 @@
   6.268  
   6.269    ret = PQgetline (P, buffer, sizeof (buffer));
   6.270  
   6.271 -  return Fcons (make_int (ret), build_extstring (buffer, PG_OS_CODING));
   6.272 +  return Fcons (make_fixnum (ret), build_extstring (buffer, PG_OS_CODING));
   6.273  }
   6.274  
   6.275  DEFUN ("pq-put-line", Fpq_put_line, 2, 2, 0, /*
   6.276 @@ -1625,7 +1625,7 @@
   6.277  
   6.278    if (ret == -1) return Qt; /* done! */
   6.279    else if (!ret) return Qnil; /* no data yet */
   6.280 -  else return Fcons (make_int (ret),
   6.281 +  else return Fcons (make_fixnum (ret),
   6.282  		     make_extstring ((Extbyte *) buffer, ret, PG_OS_CODING));
   6.283  }
   6.284  
   6.285 @@ -1907,7 +1907,7 @@
   6.286        FROB ("PGOPTIONS", VXPGOPTIONS);
   6.287  
   6.288        if ((p = egetenv ("PGPORT")))
   6.289 -	VXPGPORT = make_int (atoi ((char *) p));
   6.290 +	VXPGPORT = make_fixnum (atoi ((char *) p));
   6.291        else
   6.292  	VXPGPORT = Qnil;
   6.293  
     7.1 --- a/src/ChangeLog	Sat Oct 08 12:26:09 2011 +0100
     7.2 +++ b/src/ChangeLog	Sun Oct 09 09:51:57 2011 +0100
     7.3 @@ -1,3 +1,1013 @@
     7.4 +2011-10-09  Aidan Kehoe  <kehoea@parhasard.net>
     7.5 +
     7.6 +	* EmacsFrame.c (EmacsFrameSetValues):
     7.7 +	* README:
     7.8 +	* abbrev.c (Fexpand_abbrev):
     7.9 +	* abbrev.c (write_abbrev):
    7.10 +	* abbrev.c (describe_abbrev):
    7.11 +	* alloc.c (Fmake_list):
    7.12 +	* alloc.c (Fmake_vector):
    7.13 +	* alloc.c (Fmake_bit_vector):
    7.14 +	* alloc.c (Fmake_byte_code):
    7.15 +	* alloc.c (string_plist_ptr):
    7.16 +	* alloc.c (Fmake_string):
    7.17 +	* alloc.c (gc_plist_hack):
    7.18 +	* alloc.c (garbage_collection_statistics):
    7.19 +	* alloc.c (Fobject_memory_usage):
    7.20 +	* alloc.c (Ftotal_object_memory_usage):
    7.21 +	* alloc.c (Fconsing_since_gc):
    7.22 +	* alloc.c (Fmemory_limit):
    7.23 +	* alloc.c (Ftotal_memory_usage):
    7.24 +	* alloc.c (common_init_alloc_early):
    7.25 +	* buffer.c (finish_init_buffer):
    7.26 +	* buffer.c (MARKED_SLOT):
    7.27 +	* buffer.c (Fbuffer_modified_tick):
    7.28 +	* buffer.c (set_buffer_internal):
    7.29 +	* buffer.c (ADD_INT):
    7.30 +	* buffer.c (Fstring_char_byte_converion_info):
    7.31 +	* buffer.c (common_init_complex_vars_of_buffer):
    7.32 +	* buffer.c (complex_vars_of_buffer):
    7.33 +	* buffer.h:
    7.34 +	* buffer.h (make_charbpos):
    7.35 +	* bytecode.c:
    7.36 +	* bytecode.c (meter_code):
    7.37 +	* bytecode.c (bytecode_negate):
    7.38 +	* bytecode.c (bytecode_arithcompare):
    7.39 +	* bytecode.c (bytecode_arithop):
    7.40 +	* bytecode.c (UNUSED):
    7.41 +	* bytecode.c (check_opcode):
    7.42 +	* bytecode.c (optimize_compiled_function):
    7.43 +	* bytecode.c (set_compiled_function_documentation):
    7.44 +	* bytecode.c (Fcompiled_function_stack_depth):
    7.45 +	* bytecode.c (Fbyte_code):
    7.46 +	* callint.c (Fcall_interactively):
    7.47 +	* callint.c (Fprefix_numeric_value):
    7.48 +	* callint.c (syms_of_callint):
    7.49 +	* casefiddle.c (casify_word):
    7.50 +	* chartab.c (nsubst_structures_mapper):
    7.51 +	* chartab.c (decode_char_table_range):
    7.52 +	* chartab.c (encode_char_table_range):
    7.53 +	* chartab.c (Fmake_char_table):
    7.54 +	* chartab.c (Fcopy_char_table):
    7.55 +	* chartab.c (check_valid_char_table_value):
    7.56 +	* chartab.c (Fcheck_category_at):
    7.57 +	* chartab.c (Fset_category_table):
    7.58 +	* chartab.c (Fcategory_designator_p):
    7.59 +	* cmdloop.c (top_level_1):
    7.60 +	* cmdloop.c (initial_command_loop):
    7.61 +	* cmdloop.c (initial_error_handler):
    7.62 +	* cmdloop.c (Fcommand_loop_1):
    7.63 +	* cmds.c (Fforward_char):
    7.64 +	* cmds.c (Fbackward_char):
    7.65 +	* cmds.c (Fforward_line):
    7.66 +	* cmds.c (Fpoint_at_bol):
    7.67 +	* cmds.c (Fbeginning_of_line):
    7.68 +	* cmds.c (Fpoint_at_eol):
    7.69 +	* cmds.c (Fend_of_line):
    7.70 +	* cmds.c (Fdelete_char):
    7.71 +	* cmds.c (Fdelete_backward_char):
    7.72 +	* cmds.c (Fself_insert_command):
    7.73 +	* cmds.c (internal_self_insert):
    7.74 +	* console-gtk.c (gtk_perhaps_init_unseen_key_defaults):
    7.75 +	* console-msw.c (Fmswindows_message_box):
    7.76 +	* console-tty.c (tty_init_console):
    7.77 +	* console-x.c (x_canonicalize_console_connection):
    7.78 +	* console.c (delete_console_internal):
    7.79 +	* console.c (Fsuspend_console):
    7.80 +	* console.c (common_init_complex_vars_of_console):
    7.81 +	* console.c (MARKED_SLOT):
    7.82 +	* data.c (eq_with_ebola_notice):
    7.83 +	* data.c (Fsubr_min_args):
    7.84 +	* data.c (Fsubr_max_args):
    7.85 +	* data.c (Fchar_to_int):
    7.86 +	* data.c (Fint_to_char):
    7.87 +	* data.c (Ffixnump):
    7.88 +	* data.c (Faref):
    7.89 +	* data.c (Faset):
    7.90 +	* data.c (number_char_or_marker_to_int_or_double):
    7.91 +	* data.c (number_char_or_marker_to_double):
    7.92 +	* data.c (fixnum_char_or_marker_to_int):
    7.93 +	* data.c (ARITHCOMPARE_MANY):
    7.94 +	* data.c (Fneq):
    7.95 +	* data.c (Fzerop):
    7.96 +	* data.c (word_to_lisp):
    7.97 +	* data.c (lisp_to_word):
    7.98 +	* data.c (Fnumber_to_string):
    7.99 +	* data.c (Fstring_to_number):
   7.100 +	* data.c (Fplus):
   7.101 +	* data.c (Fminus):
   7.102 +	* data.c (Ftimes):
   7.103 +	* data.c (Fdiv):
   7.104 +	* data.c (Fquo):
   7.105 +	* data.c (Fmax):
   7.106 +	* data.c (Fmin):
   7.107 +	* data.c (Flogand):
   7.108 +	* data.c (Flogior):
   7.109 +	* data.c (Flogxor):
   7.110 +	* data.c (Flognot):
   7.111 +	* data.c (Frem):
   7.112 +	* data.c (Fmod):
   7.113 +	* data.c (Fash):
   7.114 +	* data.c (Flsh):
   7.115 +	* data.c (Fadd1):
   7.116 +	* data.c (Fsub1):
   7.117 +	* data.c (vars_of_data):
   7.118 +	* database.c (Fopen_database):
   7.119 +	* debug.c (FROB):
   7.120 +	* debug.c (Fset_debug_class_types_to_check):
   7.121 +	* device-gtk.c (Fgtk_display_visual_depth):
   7.122 +	* device-gtk.c (gtk_device_system_metrics):
   7.123 +	* device-msw.c (build_sysmetrics_cons):
   7.124 +	* device-msw.c (build_devicecaps_cons):
   7.125 +	* device-msw.c (mswindows_device_system_metrics):
   7.126 +	* device-msw.c (FROB):
   7.127 +	* device-msw.c (msprinter_device_system_metrics):
   7.128 +	* device-msw.c (print_dialog_worker):
   7.129 +	* device-msw.c (plist_get_margin):
   7.130 +	* device-msw.c (plist_set_margin):
   7.131 +	* device-msw.c (signal_enum_printer_error):
   7.132 +	* device-msw.c (Fmswindows_printer_list):
   7.133 +	* device-tty.c (tty_device_system_metrics):
   7.134 +	* device-x.c (Fx_get_resource):
   7.135 +	* device-x.c (Fx_display_visual_depth):
   7.136 +	* device-x.c (x_device_system_metrics):
   7.137 +	* device-x.c (Fx_server_version):
   7.138 +	* device-x.c (Fx_valid_keysym_name_p):
   7.139 +	* device.c (delete_device_internal):
   7.140 +	* device.c (Fset_device_baud_rate):
   7.141 +	* device.c (Fdevice_baud_rate):
   7.142 +	* device.c (Fdevice_printer_p):
   7.143 +	* dialog-msw.c (handle_directory_dialog_box):
   7.144 +	* dialog-msw.c (handle_file_dialog_box):
   7.145 +	* dialog-x.c (dbox_selection_callback):
   7.146 +	* dialog-x.c (x_make_dialog_box_internal):
   7.147 +	* dialog-x.c (syms_of_dialog_x):
   7.148 +	* dired.c:
   7.149 +	* dired.c (file_name_completion):
   7.150 +	* dired.c (user_name_completion):
   7.151 +	* dired.c (Ffile_attributes):
   7.152 +	* doc.c (extract_object_file_name):
   7.153 +	* doc.c (unparesseuxify_doc_string):
   7.154 +	* doc.c (get_doc_string):
   7.155 +	* doc.c (get_object_file_name):
   7.156 +	* doc.c (Fbuilt_in_symbol_file):
   7.157 +	* doc.c (Fdocumentation):
   7.158 +	* doc.c (Fdocumentation_property):
   7.159 +	* doc.c (Fsnarf_documentation):
   7.160 +	* doc.c (verify_doc_mapper):
   7.161 +	* doprnt.c (get_doprnt_args):
   7.162 +	* doprnt.c (emacs_doprnt_1):
   7.163 +	* editfns.c (buildmark):
   7.164 +	* editfns.c (Fpoint):
   7.165 +	* editfns.c (Fgoto_char):
   7.166 +	* editfns.c (region_limit):
   7.167 +	* editfns.c (save_excursion_save):
   7.168 +	* editfns.c (Fbuffer_size):
   7.169 +	* editfns.c (Fpoint_min):
   7.170 +	* editfns.c (Fpoint_max):
   7.171 +	* editfns.c (Fuser_login_name):
   7.172 +	* editfns.c (Fuser_uid):
   7.173 +	* editfns.c (Fuser_real_uid):
   7.174 +	* editfns.c (Femacs_pid):
   7.175 +	* editfns.c (Fcurrent_time):
   7.176 +	* editfns.c (lisp_to_time):
   7.177 +	* editfns.c (time_to_lisp):
   7.178 +	* editfns.c (Fdecode_time):
   7.179 +	* editfns.c (make_time):
   7.180 +	* editfns.c (Fencode_time):
   7.181 +	* editfns.c (Fcurrent_time_zone):
   7.182 +	* editfns.c (Finsert_char):
   7.183 +	* editfns.c (Fcompare_buffer_substrings):
   7.184 +	* editfns.c (Ftranslate_region):
   7.185 +	* editfns.c (save_restriction_save):
   7.186 +	* elhash.c (lisp_object_general_hash):
   7.187 +	* elhash.c (hash_table_size_validate):
   7.188 +	* elhash.c (decode_hash_table_size):
   7.189 +	* elhash.c (inchash_eq):
   7.190 +	* elhash.c (Fhash_table_count):
   7.191 +	* elhash.c (Fhash_table_size):
   7.192 +	* elhash.c (internal_hash):
   7.193 +	* elhash.c (Fdefine_hash_table_test):
   7.194 +	* elhash.c (vars_of_elhash):
   7.195 +	* emacs.c (make_argc_argv):
   7.196 +	* emacs.c (main_1):
   7.197 +	* emacs.c (Fkill_emacs):
   7.198 +	* emacs.c (vars_of_emacs):
   7.199 +	* emodules.c (Fload_module):
   7.200 +	* emodules.c (module_load_unwind):
   7.201 +	* eval.c:
   7.202 +	* eval.c (Fsetq):
   7.203 +	* eval.c (Fquote):
   7.204 +	* eval.c (Ffunction):
   7.205 +	* eval.c (Fdefmacro):
   7.206 +	* eval.c (Fmacroexpand_internal):
   7.207 +	* eval.c (Fthrow):
   7.208 +	* eval.c (Fcall_with_condition_handler):
   7.209 +	* eval.c (signal_wrong_number_of_arguments_error):
   7.210 +	* eval.c (funcall_compiled_function):
   7.211 +	* eval.c (function_argcount):
   7.212 +	* eval.c (multiple_value_aset):
   7.213 +	* eval.c (multiple_value_aref):
   7.214 +	* eval.c (bind_multiple_value_limits):
   7.215 +	* eval.c (multiple_value_call):
   7.216 +	* eval.c (Fmultiple_value_call):
   7.217 +	* eval.c (multiple_value_list_internal):
   7.218 +	* eval.c (Fbacktrace_debug):
   7.219 +	* eval.c (Fbacktrace):
   7.220 +	* eval.c (Fbacktrace_frame):
   7.221 +	* event-Xt.c (x_handle_sticky_modifiers):
   7.222 +	* event-msw.c (dde_eval_string):
   7.223 +	* event-stream.c (maybe_echo_keys):
   7.224 +	* event-stream.c (lisp_number_to_milliseconds):
   7.225 +	* event-stream.c (Fadd_timeout):
   7.226 +	* event-stream.c (Fdisable_timeout):
   7.227 +	* event-stream.c (Fadd_async_timeout):
   7.228 +	* event-stream.c (Fdisable_async_timeout):
   7.229 +	* event-stream.c (detect_input_pending):
   7.230 +	* event-stream.c (Fnext_event):
   7.231 +	* event-stream.c (Faccept_process_output):
   7.232 +	* event-stream.c (Fsleep_for):
   7.233 +	* event-stream.c (Fsit_for):
   7.234 +	* event-stream.c (Frecent_keys):
   7.235 +	* event-stream.c (Frecent_keys_ring_size):
   7.236 +	* event-stream.c (Fset_recent_keys_ring_size):
   7.237 +	* event-stream.c (Fdispatch_event):
   7.238 +	* event-stream.c (Fcurrent_event_timestamp):
   7.239 +	* event-stream.c (vars_of_event_stream):
   7.240 +	* event-xlike-inc.c (USE_UNICODE_MAP):
   7.241 +	* event-xlike-inc.c (endif):
   7.242 +	* events.c (print_event):
   7.243 +	* events.c (Fmake_event):
   7.244 +	* events.c (nth_of_key_sequence_as_event):
   7.245 +	* events.c (key_sequence_to_event_chain):
   7.246 +	* events.c (Fevent_timestamp):
   7.247 +	* events.c (TIMESTAMP_HALFSPACE):
   7.248 +	* events.c (Fevent_timestamp_lessp):
   7.249 +	* events.c (Fevent_button):
   7.250 +	* events.c (Fevent_modifier_bits):
   7.251 +	* events.c (Fevent_modifiers):
   7.252 +	* events.c (Fevent_window_x_pixel):
   7.253 +	* events.c (Fevent_window_y_pixel):
   7.254 +	* events.c (Fevent_x_pixel):
   7.255 +	* events.c (Fevent_y_pixel):
   7.256 +	* events.c (Fevent_point):
   7.257 +	* events.c (Fevent_closest_point):
   7.258 +	* events.c (Fevent_x):
   7.259 +	* events.c (Fevent_y):
   7.260 +	* events.c (Fevent_modeline_position):
   7.261 +	* events.c (Fevent_glyph_x_pixel):
   7.262 +	* events.c (Fevent_glyph_y_pixel):
   7.263 +	* events.c (Fevent_properties):
   7.264 +	* extents.c:
   7.265 +	* extents.c (print_extent_1):
   7.266 +	* extents.c (extent_endpoint_external):
   7.267 +	* extents.c (Fextent_length):
   7.268 +	* extents.c (Fnext_extent_change):
   7.269 +	* extents.c (Fprevious_extent_change):
   7.270 +	* extents.c (report_extent_modification_mapper):
   7.271 +	* extents.c (memoize_extent_face_internal):
   7.272 +	* extents.c (Fset_extent_priority):
   7.273 +	* extents.c (Fextent_priority):
   7.274 +	* extents.c (Fextent_property):
   7.275 +	* extents.c (extent_properties):
   7.276 +	* extents.c (run_extent_copy_paste_internal):
   7.277 +	* extents.c (next_previous_single_property_change_fn):
   7.278 +	* file-coding.c (default_query_method):
   7.279 +	* file-coding.c (encode_decode_coding_region):
   7.280 +	* file-coding.c (gzip_print):
   7.281 +	* file-coding.c (gzip_putprop):
   7.282 +	* file-coding.c (gzip_getprop):
   7.283 +	* fileio.c (close_file_unwind):
   7.284 +	* fileio.c (Ffile_modes):
   7.285 +	* fileio.c (Fset_file_modes):
   7.286 +	* fileio.c (Fset_default_file_modes):
   7.287 +	* fileio.c (Fdefault_file_modes):
   7.288 +	* fileio.c (build_annotations):
   7.289 +	* fileio.c (a_write):
   7.290 +	* fileio.c (auto_save_error):
   7.291 +	* fileio.c (do_auto_save_unwind):
   7.292 +	* fileio.c (Fdo_auto_save):
   7.293 +	* fileio.c (Fset_buffer_auto_saved):
   7.294 +	* floatfns.c:
   7.295 +	* floatfns.c (extract_float):
   7.296 +	* floatfns.c (Fexpt):
   7.297 +	* floatfns.c (Fabs):
   7.298 +	* floatfns.c (Ffloat):
   7.299 +	* floatfns.c (Flogb):
   7.300 +	* floatfns.c (CONVERT_WITHOUT_NUMBER_TYPES):
   7.301 +	* floatfns.c (MAYBE_CHAR_OR_MARKER):
   7.302 +	* floatfns.c (ceiling_two_fixnum):
   7.303 +	* floatfns.c (ceiling_two_bigfloat):
   7.304 +	* floatfns.c (ceiling_one_bigfloat):
   7.305 +	* floatfns.c (ceiling_one_mundane_arg):
   7.306 +	* floatfns.c (floor_two_fixnum):
   7.307 +	* floatfns.c (floor_two_bigfloat):
   7.308 +	* floatfns.c (floor_one_bigfloat):
   7.309 +	* floatfns.c (round_two_fixnum):
   7.310 +	* floatfns.c (round_two_bigfloat):
   7.311 +	* floatfns.c (round_one_bigfloat):
   7.312 +	* floatfns.c (truncate_two_fixnum):
   7.313 +	* floatfns.c (truncate_two_bigfloat):
   7.314 +	* floatfns.c (truncate_one_bigfloat):
   7.315 +	* floatfns.c (truncate_one_float):
   7.316 +	* fns.c (print_bit_vector):
   7.317 +	* fns.c (get_check_match_function_1):
   7.318 +	* fns.c (Frandom):
   7.319 +	* fns.c (Flength):
   7.320 +	* fns.c (Fsafe_length):
   7.321 +	* fns.c (Flist_length):
   7.322 +	* fns.c (count_with_tail):
   7.323 +	* fns.c (list_count_from_end):
   7.324 +	* fns.c (string_count_from_end):
   7.325 +	* fns.c (Fcompare_strings):
   7.326 +	* fns.c (Fstring_modified_tick):
   7.327 +	* fns.c (bump_string_modiff):
   7.328 +	* fns.c (concat):
   7.329 +	* fns.c (Fsubseq):
   7.330 +	* fns.c (Fnthcdr):
   7.331 +	* fns.c (Felt):
   7.332 +	* fns.c (Flast):
   7.333 +	* fns.c (Fnbutlast):
   7.334 +	* fns.c (Fbutlast):
   7.335 +	* fns.c (list_position_cons_before):
   7.336 +	* fns.c (position):
   7.337 +	* fns.c (FdeleteX):
   7.338 +	* fns.c (FremoveX):
   7.339 +	* fns.c (list_delete_duplicates_from_end):
   7.340 +	* fns.c (Fdelete_duplicates):
   7.341 +	* fns.c (Fremove_duplicates):
   7.342 +	* fns.c (BIT_VECTOR_TO_OBJECT_ARRAY):
   7.343 +	* fns.c (Fmerge):
   7.344 +	* fns.c (list_sort):
   7.345 +	* fns.c (FsortX):
   7.346 +	* fns.c (plists_differ):
   7.347 +	* fns.c (tweaked_internal_equal):
   7.348 +	* fns.c (internal_equal_trapping_problems):
   7.349 +	* fns.c (internal_equalp):
   7.350 +	* fns.c (Ffill):
   7.351 +	* fns.c (mapcarX):
   7.352 +	* fns.c (shortest_length_among_sequences):
   7.353 +	* fns.c (Fmapconcat):
   7.354 +	* fns.c (Freduce):
   7.355 +	* fns.c (replace_string_range_1):
   7.356 +	* fns.c (Freplace):
   7.357 +	* fns.c (Fnsubstitute):
   7.358 +	* fns.c (Fsubstitute):
   7.359 +	* fns.c (mismatch_from_end):
   7.360 +	* fns.c (mismatch_list_list):
   7.361 +	* fns.c (mismatch_list_string):
   7.362 +	* fns.c (mismatch_list_array):
   7.363 +	* fns.c (mismatch_string_array):
   7.364 +	* fns.c (mismatch_string_string):
   7.365 +	* fns.c (mismatch_array_array):
   7.366 +	* fns.c (Fsearch):
   7.367 +	* fns.c (Fload_average):
   7.368 +	* fns.c (Ffeaturep):
   7.369 +	* fns.c (base64_decode_1):
   7.370 +	* fns.c (Fbase64_encode_region):
   7.371 +	* fns.c (Fbase64_decode_region):
   7.372 +	* fns.c (Fbase64_decode_string):
   7.373 +	* font-lock.c (end_of_defun):
   7.374 +	* font-lock.c (Fsyntactically_sectionize):
   7.375 +	* font-mgr.c (Ffc_pattern_add):
   7.376 +	* font-mgr.c (Ffc_pattern_get):
   7.377 +	* font-mgr.c (Ffc_config_get_rescan_interval):
   7.378 +	* font-mgr.c (Ffc_config_set_rescan_interval):
   7.379 +	* font-mgr.c (Ffc_get_version):
   7.380 +	* font-mgr.c (Ffc_init_reinitialize):
   7.381 +	* fontcolor-gtk.c (gtk_color_instance_rgb_components):
   7.382 +	* fontcolor-gtk.c (gtk_valid_color_name_p):
   7.383 +	* fontcolor-msw.c (mswindows_color_instance_rgb_components):
   7.384 +	* fontcolor-msw.c (mswindows_valid_color_name_p):
   7.385 +	* fontcolor-x.c (x_color_instance_rgb_components):
   7.386 +	* fontcolor-x.c (x_font_instance_properties):
   7.387 +	* fontcolor-x.c (x_font_list):
   7.388 +	* fontcolor.c (Ffont_instance_ascent):
   7.389 +	* fontcolor.c (Ffont_instance_descent):
   7.390 +	* fontcolor.c (Ffont_instance_width):
   7.391 +	* fontcolor.c (Ffont_instance_proportional_p):
   7.392 +	* frame-gtk.c (gtk_frame_property):
   7.393 +	* frame-gtk.c (gtk_frame_properties):
   7.394 +	* frame-gtk.c (gtk_set_frame_properties):
   7.395 +	* frame-impl.h (FRAME_SCROLLBAR_WIDTH):
   7.396 +	* frame-impl.h (FRAME_RAW_THEORETICAL_TOOLBAR_SIZE):
   7.397 +	* frame-impl.h (FRAME_RAW_REAL_TOOLBAR_BORDER_WIDTH):
   7.398 +	* frame-msw.c (mswindows_init_frame_1):
   7.399 +	* frame-msw.c (mswindows_frame_property):
   7.400 +	* frame-msw.c (mswindows_frame_properties):
   7.401 +	* frame-msw.c (mswindows_set_frame_properties):
   7.402 +	* frame-msw.c (msprinter_frame_property):
   7.403 +	* frame-msw.c (msprinter_frame_properties):
   7.404 +	* frame-msw.c (msprinter_set_frame_properties):
   7.405 +	* frame-tty.c:
   7.406 +	* frame-tty.c (tty_frame_property):
   7.407 +	* frame-tty.c (tty_frame_properties):
   7.408 +	* frame-x.c (x_frame_property):
   7.409 +	* frame-x.c (x_frame_properties):
   7.410 +	* frame-x.c (x_set_frame_properties):
   7.411 +	* frame.c (Fmake_frame):
   7.412 +	* frame.c (delete_frame_internal):
   7.413 +	* frame.c (Fmouse_pixel_position):
   7.414 +	* frame.c (Fmouse_position):
   7.415 +	* frame.c (Fset_mouse_position):
   7.416 +	* frame.c (Fset_mouse_pixel_position):
   7.417 +	* frame.c (Fprint_job_page_number):
   7.418 +	* frame.c (Fframe_modified_tick):
   7.419 +	* frame.c (Fframe_property):
   7.420 +	* frame.c (Fframe_properties):
   7.421 +	* frame.c (Fframe_pixel_height):
   7.422 +	* frame.c (Fframe_displayable_pixel_height):
   7.423 +	* frame.c (Fframe_pixel_width):
   7.424 +	* frame.c (Fframe_displayable_pixel_width):
   7.425 +	* frame.c (Fset_frame_height):
   7.426 +	* frame.c (Fset_frame_pixel_height):
   7.427 +	* frame.c (Fset_frame_displayable_pixel_height):
   7.428 +	* frame.c (Fset_frame_width):
   7.429 +	* frame.c (Fset_frame_pixel_width):
   7.430 +	* frame.c (Fset_frame_displayable_pixel_width):
   7.431 +	* frame.c (Fset_frame_size):
   7.432 +	* frame.c (Fset_frame_pixel_size):
   7.433 +	* frame.c (Fset_frame_displayable_pixel_size):
   7.434 +	* frame.c (Fset_frame_position):
   7.435 +	* frame.c (adjust_frame_size):
   7.436 +	* free-hook.c (Freally_free):
   7.437 +	* free-hook.c (really_free_one_entry):
   7.438 +	* glyphs-eimage.c (gif_instantiate):
   7.439 +	* glyphs-eimage.c (GETCOLOR):
   7.440 +	* glyphs-gtk.c (image_instance_convert_to_pointer):
   7.441 +	* glyphs-gtk.c (init_image_instance_from_xbm_inline):
   7.442 +	* glyphs-gtk.c (xbm_instantiate_1):
   7.443 +	* glyphs-gtk.c (gtk_xbm_instantiate):
   7.444 +	* glyphs-gtk.c (gtk_xpm_instantiate):
   7.445 +	* glyphs-gtk.c (check_valid_string_or_int):
   7.446 +	* glyphs-gtk.c (autodetect_normalize):
   7.447 +	* glyphs-gtk.c (gtk_progress_gauge_redisplay):
   7.448 +	* glyphs-gtk.c (gtk_register_gui_item):
   7.449 +	* glyphs-gtk.c (gtk_tab_control_callback):
   7.450 +	* glyphs-gtk.c (BUILD_GLYPH_INST):
   7.451 +	* glyphs-msw.c (init_image_instance_from_dibitmap):
   7.452 +	* glyphs-msw.c (mswindows_initialize_image_instance_icon):
   7.453 +	* glyphs-msw.c (xpm_to_eimage):
   7.454 +	* glyphs-msw.c (resource_name_to_resource):
   7.455 +	* glyphs-msw.c (mswindows_resource_instantiate):
   7.456 +	* glyphs-msw.c (init_image_instance_from_xbm_inline):
   7.457 +	* glyphs-msw.c (xbm_instantiate_1):
   7.458 +	* glyphs-msw.c (mswindows_xbm_instantiate):
   7.459 +	* glyphs-msw.c (mswindows_register_gui_item):
   7.460 +	* glyphs-msw.c (mswindows_subwindow_instantiate):
   7.461 +	* glyphs-msw.c (mswindows_widget_instantiate):
   7.462 +	* glyphs-msw.c (mswindows_progress_gauge_instantiate):
   7.463 +	* glyphs-msw.c (mswindows_progress_gauge_redisplay):
   7.464 +	* glyphs-msw.c (mswindows_control_wnd_proc):
   7.465 +	* glyphs-widget.c:
   7.466 +	* glyphs-widget.c (check_valid_int_or_function):
   7.467 +	* glyphs-widget.c (widget_query_geometry):
   7.468 +	* glyphs-widget.c (widget_instantiate):
   7.469 +	* glyphs-widget.c (layout_update):
   7.470 +	* glyphs-widget.c (layout_query_geometry):
   7.471 +	* glyphs-widget.c (layout_layout):
   7.472 +	* glyphs-widget.c (layout_property):
   7.473 +	* glyphs-widget.c (Fwidget_logical_to_character_width):
   7.474 +	* glyphs-widget.c (Fwidget_logical_to_character_height):
   7.475 +	* glyphs-x.c (image_instance_convert_to_pointer):
   7.476 +	* glyphs-x.c (init_image_instance_from_xbm_inline):
   7.477 +	* glyphs-x.c (xbm_instantiate_1):
   7.478 +	* glyphs-x.c (x_xbm_instantiate):
   7.479 +	* glyphs-x.c (x_xpm_instantiate):
   7.480 +	* glyphs-x.c (autodetect_normalize):
   7.481 +	* glyphs-x.c (x_progress_gauge_redisplay):
   7.482 +	* glyphs-x.c (BUILD_GLYPH_INST):
   7.483 +	* glyphs.c:
   7.484 +	* glyphs.c (process_image_string_instantiator):
   7.485 +	* glyphs.c (check_valid_int):
   7.486 +	* glyphs.c (alist_to_tagged_vector):
   7.487 +	* glyphs.c (normalize_image_instantiator):
   7.488 +	* glyphs.c (print_image_instance):
   7.489 +	* glyphs.c (make_image_instance_1):
   7.490 +	* glyphs.c (Fimage_instance_depth):
   7.491 +	* glyphs.c (Fimage_instance_height):
   7.492 +	* glyphs.c (Fimage_instance_width):
   7.493 +	* glyphs.c (bitmap_to_lisp_data):
   7.494 +	* glyphs.c (xbm_normalize):
   7.495 +	* glyphs.c (pixmap_to_lisp_data):
   7.496 +	* glyphs.c (image_instantiate):
   7.497 +	* glyphs.c (image_going_to_add):
   7.498 +	* glyphs.c (Fglyph_width):
   7.499 +	* glyphs.c (Fglyph_ascent):
   7.500 +	* glyphs.c (Fglyph_descent):
   7.501 +	* glyphs.c (Fglyph_height):
   7.502 +	* glyphs.c (glyph_baseline):
   7.503 +	* glyphs.c (subwindow_instantiate):
   7.504 +	* glyphs.c (Fimage_instance_subwindow_id):
   7.505 +	* glyphs.c (Fresize_subwindow):
   7.506 +	* glyphs.c (disable_glyph_animated_timeout):
   7.507 +	* gpmevent.c (Fgpm_enable):
   7.508 +	* gtk-glue.c (xemacs_list_to_array):
   7.509 +	* gtk-xemacs.c (FROB_FACE):
   7.510 +	* gtk-xemacs.c (smash_scrollbar_specifiers):
   7.511 +	* gtk-xemacs.c (smash_toolbar_specifiers):
   7.512 +	* gui-gtk.c (gcpro_popup_callbacks):
   7.513 +	* gui-gtk.c (ungcpro_popup_callbacks):
   7.514 +	* gui-gtk.c (get_gcpro_popup_callbacks):
   7.515 +	* gui-msw.c (mswindows_handle_gui_wm_command):
   7.516 +	* gui-x.c:
   7.517 +	* gui-x.c (gcpro_popup_callbacks):
   7.518 +	* gui-x.c (ungcpro_popup_callbacks):
   7.519 +	* gui-x.c (popup_handled_p):
   7.520 +	* gui.c (gui_item_id_hash):
   7.521 +	* gutter.c (calculate_gutter_size):
   7.522 +	* gutter.c (Fgutter_pixel_width):
   7.523 +	* gutter.c (Fgutter_pixel_height):
   7.524 +	* gutter.c (gutter_specs_changed_1):
   7.525 +	* gutter.c (gutter_specs_changed):
   7.526 +	* gutter.c (gutter_size_validate):
   7.527 +	* gutter.c (specifier_vars_of_gutter):
   7.528 +	* gutter.h (WINDOW_GUTTER_BORDER_WIDTH):
   7.529 +	* indent.c (last_visible_position):
   7.530 +	* indent.c (column_at_point):
   7.531 +	* indent.c (Fcurrent_column):
   7.532 +	* indent.c (Findent_to):
   7.533 +	* indent.c (byte_spaces_at_point):
   7.534 +	* indent.c (Fcurrent_indentation):
   7.535 +	* indent.c (Fmove_to_column):
   7.536 +	* indent.c (Fcompute_motion):
   7.537 +	* indent.c (vertical_motion_1):
   7.538 +	* indent.c (Fvertical_motion_pixels):
   7.539 +	* indent.c (syms_of_indent):
   7.540 +	* insdel.c (make_gap):
   7.541 +	* insdel.c (signal_before_change):
   7.542 +	* insdel.c (signal_after_change):
   7.543 +	* insdel.c (buffer_insert_string_1):
   7.544 +	* intl-win32.c:
   7.545 +	* intl-win32.c (mswindows_get_code_page_charset):
   7.546 +	* intl-win32.c (Fmswindows_get_locale_info):
   7.547 +	* intl-win32.c (enum_code_page_fn):
   7.548 +	* intl-win32.c (Fmswindows_get_console_code_page):
   7.549 +	* intl-win32.c (Fmswindows_set_console_code_page):
   7.550 +	* intl-win32.c (Fmswindows_get_console_output_code_page):
   7.551 +	* intl-win32.c (Fmswindows_set_console_output_code_page):
   7.552 +	* intl-win32.c (Fmswindows_get_code_page_charset):
   7.553 +	* intl-win32.c (Fmswindows_get_valid_keyboard_layouts):
   7.554 +	* intl-win32.c (Fmswindows_get_keyboard_layout):
   7.555 +	* intl-win32.c (Fmswindows_set_keyboard_layout):
   7.556 +	* intl-win32.c (mswindows_multibyte_to_unicode_putprop):
   7.557 +	* intl-win32.c (mswindows_multibyte_to_unicode_getprop):
   7.558 +	* intl-win32.c (mswindows_multibyte_to_unicode_print):
   7.559 +	* keymap.c (MAKE_MODIFIER_HASH_KEY):
   7.560 +	* keymap.c (print_keymap):
   7.561 +	* keymap.c (get_keyelt):
   7.562 +	* keymap.c (keymap_fullness):
   7.563 +	* keymap.c (Fkeymap_fullness):
   7.564 +	* keymap.c (event_matches_key_specifier_p):
   7.565 +	* keymap.c (ensure_meta_prefix_char_keymapp):
   7.566 +	* keymap.c (Fdefine_key):
   7.567 +	* keymap.c (raw_lookup_key_mapper):
   7.568 +	* keymap.c (lookup_events):
   7.569 +	* keymap.c (get_relevant_keymaps):
   7.570 +	* keymap.c (Fkey_binding):
   7.571 +	* keymap.c (map_keymap_sorted):
   7.572 +	* keymap.c (Faccessible_keymaps):
   7.573 +	* keymap.c (Fkey_description):
   7.574 +	* keymap.c (Fwhere_is_internal):
   7.575 +	* keymap.c (where_is_recursive_mapper):
   7.576 +	* keymap.c (describe_map_tree):
   7.577 +	* keymap.c (describe_command):
   7.578 +	* keymap.c (describe_map_mapper):
   7.579 +	* keymap.c (describe_map_sort_predicate):
   7.580 +	* keymap.c (describe_map):
   7.581 +	* line-number.c (narrow_line_number_cache):
   7.582 +	* line-number.c (get_nearest_line_number):
   7.583 +	* line-number.c (add_position_to_cache):
   7.584 +	* line-number.c (buffer_line_number):
   7.585 +	* lisp-disunion.h:
   7.586 +	* lisp-disunion.h (Lisp_Type_Fixnum_Bit):
   7.587 +	* lisp-disunion.h (make_fixnum):
   7.588 +	* lisp-disunion.h (FIXNUMP):
   7.589 +	* lisp-disunion.h (Qzero):
   7.590 +	* lisp-union.h:
   7.591 +	* lisp-union.h (union Lisp_Object):
   7.592 +	* lisp-union.h (XREALFIXNUM):
   7.593 +	* lisp-union.h (FIXNUMP):
   7.594 +	* lisp.h:
   7.595 +	* lisp.h (enum Lisp_Type):
   7.596 +	* lisp.h (FIXNUM_GCBITS):
   7.597 +	* lisp.h (HACKEQ_UNSAFE):
   7.598 +	* lisp.h (BITP):
   7.599 +	* lisp.h (XFIXNUM):
   7.600 +	* lisp.h (CHECK_FIXNUM):
   7.601 +	* lisp.h (CONCHECK_FIXNUM):
   7.602 +	* lisp.h (XCHAR_OR_FIXNUM):
   7.603 +	* lisp.h (CHAR_INTP):
   7.604 +	* lisp.h (CHECK_CHAR_COERCE_INT):
   7.605 +	* lisp.h (CHECK_FIXNUM_COERCE_CHAR):
   7.606 +	* lisp.h (CHECK_FIXNUM_COERCE_MARKER):
   7.607 +	* lisp.h (CHECK_FIXNUM_COERCE_CHAR_OR_MARKER):
   7.608 +	* lisp.h (XFLOATFIXNUM):
   7.609 +	* lisp.h (CONCHECK_FIXNUM_OR_FLOAT):
   7.610 +	* lisp.h (FIXNUM_OR_FLOATP):
   7.611 +	* lisp.h (PARSE_KEYWORDS):
   7.612 +	* lisp.h (ARRAY_DIMENSION_LIMIT):
   7.613 +	* lread.c (pas_de_holgazan_ici):
   7.614 +	* lread.c (load_force_doc_string_unwind):
   7.615 +	* lread.c (close_load_descs):
   7.616 +	* lread.c (Fload_internal):
   7.617 +	* lread.c (decode_mode_1):
   7.618 +	* lread.c (Feval_region):
   7.619 +	* lread.c (Fread_from_string):
   7.620 +	* lread.c (read_unicode_escape):
   7.621 +	* lread.c (read_atom):
   7.622 +	* lread.c (parse_integer):
   7.623 +	* lread.c (read_structure):
   7.624 +	* lread.c (read1):
   7.625 +	* lread.c (read_vector):
   7.626 +	* lread.c (read_compiled_function):
   7.627 +	* lstream.c (make_lisp_buffer_stream_1):
   7.628 +	* macros.c (Fstart_kbd_macro):
   7.629 +	* macros.c (Fend_kbd_macro):
   7.630 +	* macros.c (pop_kbd_macro_event):
   7.631 +	* macros.c (Fexecute_kbd_macro):
   7.632 +	* marker.c (Fmarker_position):
   7.633 +	* marker.c (set_marker_internal):
   7.634 +	* marker.c (copy_marker_1):
   7.635 +	* marker.c (init_buffer_markers):
   7.636 +	* marker.c (uninit_buffer_markers):
   7.637 +	* mc-alloc.c (Fmc_alloc_memory_usage):
   7.638 +	* mc-alloc.c (syms_of_mc_alloc):
   7.639 +	* menubar-msw.c (allocate_menu_item_id):
   7.640 +	* menubar-msw.c (populate_menu_add_item):
   7.641 +	* menubar-msw.c (mswindows_handle_wm_command):
   7.642 +	* menubar.c (Fcompare_menu_text):
   7.643 +	* minibuf.c:
   7.644 +	* minibuf.c (Fminibuffer_depth):
   7.645 +	* minibuf.c (read_minibuffer_internal_unwind):
   7.646 +	* minibuf.c (Fminibuffer_prompt_width):
   7.647 +	* mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION):
   7.648 +	* mule-ccl.c (CCL_WRITE_STRING):
   7.649 +	* mule-ccl.c (ccl_driver):
   7.650 +	* mule-ccl.c (resolve_symbol_ccl_program):
   7.651 +	* mule-ccl.c (ccl_get_compiled_code):
   7.652 +	* mule-ccl.c (setup_ccl_program):
   7.653 +	* mule-ccl.c (Fccl_execute):
   7.654 +	* mule-ccl.c (vars_of_mule_ccl):
   7.655 +	* mule-charset.c:
   7.656 +	* mule-charset.c (get_unallocated_leading_byte):
   7.657 +	* mule-charset.c (Fmake_charset):
   7.658 +	* mule-charset.c (Fcharset_from_attributes):
   7.659 +	* mule-charset.c (Fcharset_dimension):
   7.660 +	* mule-charset.c (Fcharset_property):
   7.661 +	* mule-charset.c (Fcharset_id):
   7.662 +	* mule-coding.c (Fdecode_shift_jis_char):
   7.663 +	* mule-coding.c (Fencode_shift_jis_char):
   7.664 +	* mule-coding.c (Fdecode_big5_char):
   7.665 +	* mule-coding.c (Fencode_big5_char):
   7.666 +	* mule-coding.c (charset_by_attributes_or_create_one):
   7.667 +	* mule-coding.c (decode_unicode_char):
   7.668 +	* mule-coding.c (fixed_width_skip_chars_data_given_strings):
   7.669 +	* mule-coding.c (fixed_width_query):
   7.670 +	* mule-wnnfns.c (Fwnn_dict_add):
   7.671 +	* mule-wnnfns.c (Fwnn_dict_delete):
   7.672 +	* mule-wnnfns.c (Fwnn_dict_list):
   7.673 +	* mule-wnnfns.c (Fwnn_dict_comment):
   7.674 +	* mule-wnnfns.c (Fwnn_begin_henkan):
   7.675 +	* mule-wnnfns.c (Fwnn_zenkouho):
   7.676 +	* mule-wnnfns.c (Fwnn_get_zenkouho):
   7.677 +	* mule-wnnfns.c (Fwnn_zenkouho_bun):
   7.678 +	* mule-wnnfns.c (Fwnn_zenkouho_suu):
   7.679 +	* mule-wnnfns.c (Fwnn_dai_top):
   7.680 +	* mule-wnnfns.c (Fwnn_dai_end):
   7.681 +	* mule-wnnfns.c (Fwnn_kakutei):
   7.682 +	* mule-wnnfns.c (Fwnn_bunsetu_henkou):
   7.683 +	* mule-wnnfns.c (Fwnn_inspect):
   7.684 +	* mule-wnnfns.c (Fwnn_bunsetu_kanji):
   7.685 +	* mule-wnnfns.c (Fwnn_bunsetu_yomi):
   7.686 +	* mule-wnnfns.c (Fwnn_bunsetu_suu):
   7.687 +	* mule-wnnfns.c (Fwnn_hindo_update):
   7.688 +	* mule-wnnfns.c (Fwnn_word_toroku):
   7.689 +	* mule-wnnfns.c (Fwnn_word_sakujo):
   7.690 +	* mule-wnnfns.c (Fwnn_word_use):
   7.691 +	* mule-wnnfns.c (Fwnn_word_info):
   7.692 +	* mule-wnnfns.c (Fwnn_hindo_set):
   7.693 +	* mule-wnnfns.c (Fwnn_dict_search):
   7.694 +	* mule-wnnfns.c (Fwnn_get_param):
   7.695 +	* mule-wnnfns.c (Fwnn_set_param):
   7.696 +	* mule-wnnfns.c (Fwnn_get_msg):
   7.697 +	* mule-wnnfns.c (Fwnn_hinsi_dicts):
   7.698 +	* mule-wnnfns.c (Fwnn_hinsi_list):
   7.699 +	* mule-wnnfns.c (Fwnn_notrans_dict_add):
   7.700 +	* mule-wnnfns.c (Fwnn_bmodify_dict_add):
   7.701 +	* mule-wnnfns.c (Fwnn_okuri_flag):
   7.702 +	* mule-wnnfns.c (Fwnn_prefix_flag):
   7.703 +	* mule-wnnfns.c (Fwnn_freq_func):
   7.704 +	* mule-wnnfns.c (Fwnn_numeric):
   7.705 +	* mule-wnnfns.c (Fwnn_alphabet):
   7.706 +	* mule-wnnfns.c (Fwnn_symbol):
   7.707 +	* mule-wnnfns.c (Fwnn_version):
   7.708 +	* mule-wnnfns.c (Fwnn_hinsi_number):
   7.709 +	* mule-wnnfns.c (syms_of_mule_wnn):
   7.710 +	* number.c:
   7.711 +	* number.c (Fdenominator):
   7.712 +	* number.c (Fbigfloat_get_precision):
   7.713 +	* number.c (Fbigfloat_set_precision):
   7.714 +	* number.c (default_float_precision_changed):
   7.715 +	* number.c (Fcanonicalize_number):
   7.716 +	* number.c (get_number_type):
   7.717 +	* number.c (promote_args):
   7.718 +	* number.c (Fcoerce_number):
   7.719 +	* number.c (vars_of_number):
   7.720 +	* number.h (INTEGERP):
   7.721 +	* number.h (make_integer):
   7.722 +	* number.h (NATNUMP):
   7.723 +	* number.h (CHECK_NATNUM):
   7.724 +	* print.c (output_string):
   7.725 +	* print.c (print_vector_internal):
   7.726 +	* print.c (print_cons):
   7.727 +	* print.c (print_string):
   7.728 +	* print.c (print_preprocess_inchash_eq):
   7.729 +	* print.c (print_seen_once):
   7.730 +	* print.c (print_nonsymbol_seen_once):
   7.731 +	* print.c (print_sort_get_numbers):
   7.732 +	* print.c (print_gensym_or_circle):
   7.733 +	* print.c (nsubst_structures_descend):
   7.734 +	* print.c (print_internal):
   7.735 +	* print.c (restore_inhibit_non_essential_conversion_operations):
   7.736 +	* print.c (begin_inhibit_non_essential_conversion_operations):
   7.737 +	* print.c (debug_print_enter):
   7.738 +	* print.c (debug_p4):
   7.739 +	* process-nt.c (validate_signal_number):
   7.740 +	* process-nt.c (nt_send_process):
   7.741 +	* process-nt.c (nt_open_network_stream):
   7.742 +	* process-nt.c (Fmswindows_set_process_priority):
   7.743 +	* process-unix.c:
   7.744 +	* process-unix.c (connect_to_file_descriptor):
   7.745 +	* process-unix.c (get_internet_address):
   7.746 +	* process-unix.c (child_setup):
   7.747 +	* process-unix.c (unix_update_status_if_terminated):
   7.748 +	* process-unix.c (unix_reap_exited_processes):
   7.749 +	* process-unix.c (unix_send_process):
   7.750 +	* process-unix.c (unix_kill_child_process):
   7.751 +	* process-unix.c (unix_open_network_stream):
   7.752 +	* process-unix.c (unix_open_multicast_group):
   7.753 +	* process.c (create_process):
   7.754 +	* process.c (Fstart_process_internal):
   7.755 +	* process.c (Fset_process_window_size):
   7.756 +	* process.c (read_process_output):
   7.757 +	* process.c (status_message):
   7.758 +	* process.c (status_notify):
   7.759 +	* process.c (Fprocess_exit_status):
   7.760 +	* process.c (decode_signal):
   7.761 +	* process.c (Fprocess_send_eof):
   7.762 +	* profile.c:
   7.763 +	* profile.c (profile_sow_backtrace):
   7.764 +	* profile.c (profile_reap_backtrace):
   7.765 +	* profile.c (Fstart_profiling):
   7.766 +	* profile.c (get_profiling_info_timing_maphash):
   7.767 +	* profile.c (Fget_profiling_info):
   7.768 +	* profile.c (set_profiling_info_timing_maphash):
   7.769 +	* ralloc.c:
   7.770 +	* ralloc.c (MLVAL):
   7.771 +	* rangetab.c (Fget_range_table):
   7.772 +	* rangetab.c (Fput_range_table):
   7.773 +	* rangetab.c (Fmap_range_table):
   7.774 +	* rangetab.c (rangetab_data_validate):
   7.775 +	* redisplay-msw.c (mswindows_output_vertical_divider):
   7.776 +	* redisplay-output.c (redisplay_move_cursor):
   7.777 +	* redisplay-output.c (redisplay_output_layout):
   7.778 +	* redisplay-output.c (redisplay_output_window):
   7.779 +	* redisplay-output.c (redisplay_redraw_exposed_area_1):
   7.780 +	* redisplay-output.c (redisplay_redraw_exposed_area):
   7.781 +	* redisplay-output.c (bevel_modeline):
   7.782 +	* redisplay-xlike-inc.c (XLIKE_get_gc):
   7.783 +	* redisplay-xlike-inc.c (XLIKE_output_string):
   7.784 +	* redisplay-xlike-inc.c (XLIKE_output_vertical_divider):
   7.785 +	* redisplay-xlike-inc.c (XLIKE_output_blank):
   7.786 +	* redisplay-xlike-inc.c (XLIKE_output_eol_cursor):
   7.787 +	* redisplay.c (tab_char_width):
   7.788 +	* redisplay.c (add_glyph_rune):
   7.789 +	* redisplay.c (create_text_block):
   7.790 +	* redisplay.c (generate_fstring_runes):
   7.791 +	* redisplay.c (create_string_text_block):
   7.792 +	* redisplay.c (regenerate_window):
   7.793 +	* redisplay.c (regenerate_window_extents_only_changed):
   7.794 +	* redisplay.c (regenerate_window_incrementally):
   7.795 +	* redisplay.c (regenerate_window_point_center):
   7.796 +	* redisplay.c (redisplay_window):
   7.797 +	* redisplay.c (validate_line_start_cache):
   7.798 +	* redisplay.c (update_line_start_cache):
   7.799 +	* scrollbar-gtk.c (scrollbar_cb):
   7.800 +	* scrollbar-msw.c (mswindows_handle_scrollbar_event):
   7.801 +	* scrollbar-x.c (x_update_vertical_scrollbar_callback):
   7.802 +	* scrollbar-x.c (x_update_horizontal_scrollbar_callback):
   7.803 +	* scrollbar.c (scrollbar_reset_cursor):
   7.804 +	* scrollbar.c (Fscrollbar_line_up):
   7.805 +	* scrollbar.c (Fscrollbar_line_down):
   7.806 +	* scrollbar.c (Fscrollbar_page_up):
   7.807 +	* scrollbar.c (Fscrollbar_page_down):
   7.808 +	* scrollbar.c (Fscrollbar_to_bottom):
   7.809 +	* scrollbar.c (Fscrollbar_vertical_drag):
   7.810 +	* scrollbar.c (Fscrollbar_set_hscroll):
   7.811 +	* scrollbar.c (specifier_vars_of_scrollbar):
   7.812 +	* search.c (string_match_1):
   7.813 +	* search.c (skip_chars):
   7.814 +	* search.c (search_command):
   7.815 +	* search.c (Freplace_match):
   7.816 +	* search.c (match_limit):
   7.817 +	* search.c (Fmatch_data):
   7.818 +	* search.c (Fstore_match_data):
   7.819 +	* select-gtk.c (gtk_get_foreign_selection):
   7.820 +	* select-msw.c (x_sym_p):
   7.821 +	* select-msw.c (symbol_to_ms_cf):
   7.822 +	* select-msw.c (ms_cf_to_symbol):
   7.823 +	* select-msw.c (mswindows_own_selection):
   7.824 +	* select-msw.c (mswindows_register_selection_data_type):
   7.825 +	* select-msw.c (mswindows_selection_data_type_name):
   7.826 +	* select-x.c:
   7.827 +	* select-x.c (x_get_foreign_selection):
   7.828 +	* select-x.c (Fx_get_cutbuffer_internal):
   7.829 +	* select-x.c (Fx_rotate_cutbuffers_internal):
   7.830 +	* select-xlike-inc.c (selection_data_to_lisp_data):
   7.831 +	* select-xlike-inc.c (lisp_data_to_selection_data):
   7.832 +	* select.c (Favailable_selection_types):
   7.833 +	* sgiplay.c (close_sound_file):
   7.834 +	* sgiplay.c (play_sound_file):
   7.835 +	* sgiplay.c (restore_audio_port):
   7.836 +	* sgiplay.c (audio_initialize):
   7.837 +	* sgiplay.c (set_channels):
   7.838 +	* sgiplay.c (set_output_format):
   7.839 +	* sound.c (Fplay_sound_file):
   7.840 +	* sound.c (parse_sound_alist_elt):
   7.841 +	* sound.c (Fplay_sound):
   7.842 +	* specifier.c:
   7.843 +	* specifier.c (print_specifier):
   7.844 +	* specifier.c (canonicalize_tag_set):
   7.845 +	* specifier.c (call_charset_predicate):
   7.846 +	* specifier.c (Fdefine_specifier_tag):
   7.847 +	* specifier.c (specifier_instance_1):
   7.848 +	* specifier.c (integer_validate):
   7.849 +	* specifier.h (XFIXNUMEGER_SPECIFIER):
   7.850 +	* symbols.c:
   7.851 +	* symbols.c (Fintern):
   7.852 +	* symbols.c (Fintern_soft):
   7.853 +	* symbols.c (Funintern):
   7.854 +	* symbols.c (oblookup):
   7.855 +	* symbols.c (do_symval_forwarding):
   7.856 +	* symbols.c (set_default_buffer_slot_variable):
   7.857 +	* symbols.c (set_default_console_slot_variable):
   7.858 +	* symbols.c (store_symval_forwarding):
   7.859 +	* symbols.c (Fset):
   7.860 +	* symbols.c (Fsetq_default):
   7.861 +	* symbols.c (symbol_value_buffer_local_info):
   7.862 +	* symbols.c (user_variable_alias_check_fun):
   7.863 +	* symbols.c (Fuser_variable_p):
   7.864 +	* syntax.c (Fsyntax_cache_info):
   7.865 +	* syntax.c (Fset_syntax_table):
   7.866 +	* syntax.c (reset_syntax_cache_range):
   7.867 +	* syntax.c (update_syntax_cache):
   7.868 +	* syntax.c (syntax_match):
   7.869 +	* syntax.c (Fforward_word):
   7.870 +	* syntax.c (Fforward_comment):
   7.871 +	* syntax.c (scan_lists):
   7.872 +	* syntax.c (Fscan_lists):
   7.873 +	* syntax.c (Fscan_sexps):
   7.874 +	* syntax.c (scan_sexps_forward):
   7.875 +	* syntax.c (Fparse_partial_sexp):
   7.876 +	* syntax.c (copy_to_mirrortab):
   7.877 +	* syntax.c (copy_if_not_already_present):
   7.878 +	* syntax.c (update_just_this_syntax_table):
   7.879 +	* syntax.c (define_standard_syntax):
   7.880 +	* syntax.c (SET_RANGE_SYNTAX):
   7.881 +	* syntax.c (complex_vars_of_syntax):
   7.882 +	* syntax.h:
   7.883 +	* sysdep.c:
   7.884 +	* sysdep.c (init_system_name):
   7.885 +	* sysdep.c (get_random):
   7.886 +	* tests.c:
   7.887 +	* tests.c (test_hash_tables_mapper):
   7.888 +	* tests.c (test_hash_tables_modifying_mapper):
   7.889 +	* tests.c (test_hash_tables_predicate):
   7.890 +	* tests.c (Ftest_hash_tables):
   7.891 +	* text.c (get_buffer_pos_char):
   7.892 +	* text.c (get_string_pos_char_1):
   7.893 +	* text.c (non_ascii_valid_ichar_p):
   7.894 +	* text.c (Fmake_char):
   7.895 +	* text.c (Fchar_octet):
   7.896 +	* text.c (Fsplit_char):
   7.897 +	* toolbar-msw.c (allocate_toolbar_item_id):
   7.898 +	* toolbar-msw.c (mswindows_clear_toolbar):
   7.899 +	* toolbar-msw.c (mswindows_output_toolbar):
   7.900 +	* toolbar-msw.c (mswindows_get_toolbar_button_text):
   7.901 +	* toolbar-msw.c (mswindows_handle_toolbar_wm_command):
   7.902 +	* toolbar-xlike.c (__prepare_button_area):
   7.903 +	* toolbar-xlike.c (xlike_get_button_size):
   7.904 +	* toolbar.c (Fcheck_toolbar_button_syntax):
   7.905 +	* toolbar.c (specifier_vars_of_toolbar):
   7.906 +	* tooltalk.c (tooltalk_constant_value):
   7.907 +	* tooltalk.c (Fadd_tooltalk_message_arg):
   7.908 +	* tooltalk.c (Fadd_tooltalk_pattern_arg):
   7.909 +	* tooltalk.c (init_tooltalk):
   7.910 +	* tooltalk.c (MAKE_CONSTANT):
   7.911 +	* tooltalk.c (vars_of_tooltalk):
   7.912 +	* tooltalk.h (CHECK_TOOLTALK_CONSTANT):
   7.913 +	* tooltalk.h (VALID_TOOLTALK_MESSAGEP):
   7.914 +	* ui-byhand.c (Fgtk_box_query_child_packing):
   7.915 +	* ui-byhand.c (Fgtk_button_box_get_child_size):
   7.916 +	* ui-byhand.c (Fgtk_calendar_get_date):
   7.917 +	* ui-byhand.c (Fgtk_clist_get_text):
   7.918 +	* ui-byhand.c (Fgtk_clist_get_selection):
   7.919 +	* ui-byhand.c (Fgtk_clist_get_pixmap):
   7.920 +	* ui-byhand.c (Fgtk_clist_get_pixtext):
   7.921 +	* ui-byhand.c (Fgtk_editable_insert_text):
   7.922 +	* ui-byhand.c (Fgtk_curve_get_vector):
   7.923 +	* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
   7.924 +	* ui-byhand.c (Fgtk_widget_get_pointer):
   7.925 +	* ui-byhand.c (generic_toolbar_insert_item):
   7.926 +	* ui-byhand.c (Fgtk_toolbar_insert_item):
   7.927 +	* ui-byhand.c (Fgtk_ctree_recurse):
   7.928 +	* ui-gtk.c:
   7.929 +	* ui-gtk.c (import_gtk_enumeration_internal):
   7.930 +	* ui-gtk.c (Fgtk_call_function):
   7.931 +	* ui-gtk.c (__internal_callback_destroy):
   7.932 +	* ui-gtk.c (Fgtk_signal_connect):
   7.933 +	* ui-gtk.c (Fgtk_fundamental_type):
   7.934 +	* ui-gtk.c (Fgtk_object_type):
   7.935 +	* ui-gtk.c (Fgtk_describe_type):
   7.936 +	* ui-gtk.c (gtk_type_to_lisp):
   7.937 +	* ui-gtk.c (lisp_to_gtk_type):
   7.938 +	* ui-gtk.c (lisp_to_gtk_ret_type):
   7.939 +	* ui-gtk.c (get_enumeration):
   7.940 +	* ui-gtk.c (symbol_to_enum):
   7.941 +	* ui-gtk.c (flags_to_list):
   7.942 +	* ui-gtk.c (enum_to_symbol):
   7.943 +	* undo.c (undo_prelude):
   7.944 +	* undo.c (record_insert):
   7.945 +	* undo.c (record_delete):
   7.946 +	* undo.c (record_property_change):
   7.947 +	* undo.c (Fprimitive_undo):
   7.948 +	* unicode.c (unicode_to_ichar):
   7.949 +	* unicode.c (Fchar_to_unicode):
   7.950 +	* unicode.c (Funicode_to_char):
   7.951 +	* unicode.c (add_lisp_string_to_skip_chars_range):
   7.952 +	* unicode.c (unicode_query):
   7.953 +	* unicode.c (vars_of_unicode):
   7.954 +	* win32.c (Fmswindows_shell_execute):
   7.955 +	* window-impl.h (MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED):
   7.956 +	* window-impl.h (MODELINE_SHADOW_THICKNESS):
   7.957 +	* window.c (window_divider_width):
   7.958 +	* window.c (window_scrollbar_width):
   7.959 +	* window.c (window_scrollbar_height):
   7.960 +	* window.c (margin_width_internal):
   7.961 +	* window.c (Fpos_visible_in_window_p):
   7.962 +	* window.c (Fwindow_height):
   7.963 +	* window.c (Fwindow_displayed_height):
   7.964 +	* window.c (Fwindow_pixel_height):
   7.965 +	* window.c (Fwindow_text_area_height):
   7.966 +	* window.c (Fwindow_width):
   7.967 +	* window.c (Fwindow_full_width):
   7.968 +	* window.c (Fwindow_pixel_width):
   7.969 +	* window.c (Fwindow_hscroll):
   7.970 +	* window.c (Fmodeline_hscroll):
   7.971 +	* window.c (Fset_modeline_hscroll):
   7.972 +	* window.c (Fset_window_hscroll):
   7.973 +	* window.c (Fwindow_pixel_edges):
   7.974 +	* window.c (Fwindow_end):
   7.975 +	* window.c (Fwindow_last_line_visible_height):
   7.976 +	* window.c (Fset_window_point):
   7.977 +	* window.c (Fset_window_start):
   7.978 +	* window.c (unshow_buffer):
   7.979 +	* window.c (Fother_window):
   7.980 +	* window.c (window_loop):
   7.981 +	* window.c (buffer_window_count):
   7.982 +	* window.c (Fdelete_other_windows):
   7.983 +	* window.c (Fset_window_buffer):
   7.984 +	* window.c (Fselect_window):
   7.985 +	* window.c (temp_output_buffer_show):
   7.986 +	* window.c (Fsplit_window):
   7.987 +	* window.c (Fenlarge_window):
   7.988 +	* window.c (Fenlarge_window_pixels):
   7.989 +	* window.c (Fshrink_window):
   7.990 +	* window.c (Fshrink_window_pixels):
   7.991 +	* window.c (window_scroll):
   7.992 +	* window.c (Fscroll_left):
   7.993 +	* window.c (Fscroll_right):
   7.994 +	* window.c (Fcenter_to_window_line):
   7.995 +	* window.c (Fmove_to_window_line):
   7.996 +	* window.c (get_current_pixel_pos):
   7.997 +	* window.c (Fcurrent_pixel_column):
   7.998 +	* window.c (Fcurrent_pixel_row):
   7.999 +	* window.c (specifier_vars_of_window):
  7.1000 +	* xemacs.def.in.in:
  7.1001 +	Mechanically change INT (where it refers to non-bignum Lisp
  7.1002 +	integers) to FIXNUM in our sources. Done for the following
  7.1003 +	functions, enums, and macros: Lisp_Type_Int_Even,
  7.1004 +	Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(),
  7.1005 +	XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(),
  7.1006 +	EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to
  7.1007 +	MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to
  7.1008 +	NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT.
  7.1009 +	The EMACS_INT typedef was not changed, it does not describe
  7.1010 +	non-bignum Lisp integers.
  7.1011 +	Script that did the change available in
  7.1012 +	http://mid.gmane.org/20067.17650.181273.12014@parhasard.net . 
  7.1013 +
  7.1014  2011-09-06  Aidan Kehoe  <kehoea@parhasard.net>
  7.1015  
  7.1016  	* redisplay-tty.c (init_tty_for_redisplay):
     8.1 --- a/src/EmacsFrame.c	Sat Oct 08 12:26:09 2011 +0100
     8.2 +++ b/src/EmacsFrame.c	Sun Oct 09 09:51:57 2011 +0100
     8.3 @@ -396,13 +396,13 @@
     8.4  	  new_->emacs_frame.scrollbar_width)
     8.5  	Fadd_spec_to_specifier
     8.6  	  (Vscrollbar_width,
     8.7 -	   make_int (new_->emacs_frame.scrollbar_width),
     8.8 +	   make_fixnum (new_->emacs_frame.scrollbar_width),
     8.9  	   wrap_frame (f), Qnil, Qnil);
    8.10        if (cur->emacs_frame.scrollbar_height !=
    8.11  	  new_->emacs_frame.scrollbar_height)
    8.12  	Fadd_spec_to_specifier
    8.13  	  (Vscrollbar_height,
    8.14 -	   make_int (new_->emacs_frame.scrollbar_height),
    8.15 +	   make_fixnum (new_->emacs_frame.scrollbar_height),
    8.16  	   wrap_frame (f), Qnil, Qnil);
    8.17  #endif /* HAVE_SCROLLBARS */
    8.18  #ifdef HAVE_TOOLBARS
    8.19 @@ -410,49 +410,49 @@
    8.20  	  new_->emacs_frame.top_toolbar_height)
    8.21  	Fadd_spec_to_specifier
    8.22  	  (Vtoolbar_size[TOP_EDGE],
    8.23 -	   make_int (new_->emacs_frame.top_toolbar_height),
    8.24 +	   make_fixnum (new_->emacs_frame.top_toolbar_height),
    8.25  	   wrap_frame (f), Qnil, Qnil);
    8.26        if (cur->emacs_frame.bottom_toolbar_height !=
    8.27  	  new_->emacs_frame.bottom_toolbar_height)
    8.28  	Fadd_spec_to_specifier
    8.29  	  (Vtoolbar_size[BOTTOM_EDGE],
    8.30 -	   make_int (new_->emacs_frame.bottom_toolbar_height),
    8.31 +	   make_fixnum (new_->emacs_frame.bottom_toolbar_height),
    8.32  	   wrap_frame (f), Qnil, Qnil);
    8.33        if (cur->emacs_frame.left_toolbar_width !=
    8.34  	  new_->emacs_frame.left_toolbar_width)
    8.35  	Fadd_spec_to_specifier
    8.36  	  (Vtoolbar_size[LEFT_EDGE],
    8.37 -	   make_int (new_->emacs_frame.left_toolbar_width),
    8.38 +	   make_fixnum (new_->emacs_frame.left_toolbar_width),
    8.39  	   wrap_frame (f), Qnil, Qnil);
    8.40        if (cur->emacs_frame.right_toolbar_width !=
    8.41  	  new_->emacs_frame.right_toolbar_width)
    8.42  	Fadd_spec_to_specifier
    8.43  	  (Vtoolbar_size[RIGHT_EDGE],
    8.44 -	   make_int (new_->emacs_frame.right_toolbar_width),
    8.45 +	   make_fixnum (new_->emacs_frame.right_toolbar_width),
    8.46  	   wrap_frame (f), Qnil, Qnil);
    8.47        if (cur->emacs_frame.top_toolbar_border_width !=
    8.48  	  new_->emacs_frame.top_toolbar_border_width)
    8.49  	Fadd_spec_to_specifier
    8.50  	  (Vtoolbar_border_width[TOP_EDGE],
    8.51 -	   make_int (new_->emacs_frame.top_toolbar_border_width),
    8.52 +	   make_fixnum (new_->emacs_frame.top_toolbar_border_width),
    8.53  	   wrap_frame (f), Qnil, Qnil);
    8.54        if (cur->emacs_frame.bottom_toolbar_border_width !=
    8.55  	  new_->emacs_frame.bottom_toolbar_border_width)
    8.56  	Fadd_spec_to_specifier
    8.57  	  (Vtoolbar_border_width[BOTTOM_EDGE],
    8.58 -	   make_int (new_->emacs_frame.bottom_toolbar_border_width),
    8.59 +	   make_fixnum (new_->emacs_frame.bottom_toolbar_border_width),
    8.60  	   wrap_frame (f), Qnil, Qnil);
    8.61        if (cur->emacs_frame.left_toolbar_border_width !=
    8.62  	  new_->emacs_frame.left_toolbar_border_width)
    8.63  	Fadd_spec_to_specifier
    8.64  	  (Vtoolbar_border_width[LEFT_EDGE],
    8.65 -	   make_int (new_->emacs_frame.left_toolbar_border_width),
    8.66 +	   make_fixnum (new_->emacs_frame.left_toolbar_border_width),
    8.67  	   wrap_frame (f), Qnil, Qnil);
    8.68        if (cur->emacs_frame.right_toolbar_border_width !=
    8.69  	  new_->emacs_frame.right_toolbar_border_width)
    8.70  	Fadd_spec_to_specifier
    8.71  	  (Vtoolbar_border_width[RIGHT_EDGE],
    8.72 -	   make_int (new_->emacs_frame.right_toolbar_border_width),
    8.73 +	   make_fixnum (new_->emacs_frame.right_toolbar_border_width),
    8.74  	   wrap_frame (f), Qnil, Qnil);
    8.75  #endif /* HAVE_TOOLBARS */
    8.76  
     9.1 --- a/src/README	Sat Oct 08 12:26:09 2011 +0100
     9.2 +++ b/src/README	Sun Oct 09 09:51:57 2011 +0100
     9.3 @@ -19,9 +19,9 @@
     9.4        is incompatible with the union form of Lisp objects, and use as
     9.5        an rvalue is likely to lead to errors and doesn't really save much
     9.6        time.  Expressions of the form `XFASTINT (obj) = num;' get replaced
     9.7 -      by `obj = make_int (num);' or `XSETINT (obj, num);' and
     9.8 +      by `obj = make_fixnum (num);' or `XSETINT (obj, num);' and
     9.9        expressions of the form `num = XFASTINT (obj);' get replaced by
    9.10 -      `num = XINT (obj);'.  Use Qzero in place of `make_int (0)'.
    9.11 +      `num = XFIXNUM (obj);'.  Use Qzero in place of `make_fixnum (0)'.
    9.12  
    9.13     -- Use of XTYPE gets replaced by the appropriate predicate.  Using
    9.14        XTYPE only works for the small number of types that are not stored
    10.1 --- a/src/abbrev.c	Sat Oct 08 12:26:09 2011 +0100
    10.2 +++ b/src/abbrev.c	Sun Oct 09 09:51:57 2011 +0100
    10.3 @@ -370,13 +370,13 @@
    10.4        if (!abbrev_all_caps
    10.5  	  && scan_words (buf, point, -1) > scan_words (buf, abbrev_start, 1))
    10.6  	{
    10.7 -	  Fupcase_initials_region (make_int (abbrev_start), make_int (point),
    10.8 +	  Fupcase_initials_region (make_fixnum (abbrev_start), make_fixnum (point),
    10.9  				   wrap_buffer (buf));
   10.10  	}
   10.11        else
   10.12  	{
   10.13  	  /* If expansion is one word, or if user says so, upcase it all. */
   10.14 -	  Fupcase_region (make_int (abbrev_start), make_int (point),
   10.15 +	  Fupcase_region (make_fixnum (abbrev_start), make_fixnum (point),
   10.16  			  wrap_buffer (buf));
   10.17  	}
   10.18      }
   10.19 @@ -390,7 +390,7 @@
   10.20  				BUF_FETCH_CHAR (buf, pos)))
   10.21  	pos++;
   10.22        /* Change just that.  */
   10.23 -      Fupcase_initials_region (make_int (pos), make_int (pos + 1),
   10.24 +      Fupcase_initials_region (make_fixnum (pos), make_fixnum (pos + 1),
   10.25  			       wrap_buffer (buf));
   10.26      }
   10.27  
   10.28 @@ -408,7 +408,7 @@
   10.29    /* This function can GC */
   10.30    struct buffer *buf = current_buffer;
   10.31  
   10.32 -  if (INTP (XSYMBOL (sym)->plist))
   10.33 +  if (FIXNUMP (XSYMBOL (sym)->plist))
   10.34      {
   10.35        count = XSYMBOL (sym)->plist;
   10.36        system_flag = Qnil;
   10.37 @@ -441,7 +441,7 @@
   10.38    /* This function can GC */
   10.39    struct buffer *buf = current_buffer;
   10.40  
   10.41 -  if (INTP (XSYMBOL (sym)->plist))
   10.42 +  if (FIXNUMP (XSYMBOL (sym)->plist))
   10.43      {
   10.44        count = XSYMBOL (sym)->plist;
   10.45        system_flag = Qnil;
   10.46 @@ -455,23 +455,23 @@
   10.47    if (NILP (XSYMBOL_VALUE (sym)))
   10.48      return;
   10.49  
   10.50 -  one = make_int (1);
   10.51 +  one = make_fixnum (1);
   10.52    Fprin1 (Fsymbol_name (sym), stream);
   10.53  
   10.54    if (!NILP (system_flag))
   10.55      {
   10.56        buffer_insert_ascstring (buf, " (sys)");
   10.57 -      Findent_to (make_int (20), one, Qnil);
   10.58 +      Findent_to (make_fixnum (20), one, Qnil);
   10.59      }
   10.60    else
   10.61 -    Findent_to (make_int (15), one, Qnil);
   10.62 +    Findent_to (make_fixnum (15), one, Qnil);
   10.63  
   10.64    Fprin1 (count, stream);
   10.65 -  Findent_to (make_int (20), one, Qnil);
   10.66 +  Findent_to (make_fixnum (20), one, Qnil);
   10.67    Fprin1 (XSYMBOL_VALUE (sym), stream);
   10.68    if (!NILP (XSYMBOL (sym)->function))
   10.69      {
   10.70 -      Findent_to (make_int (45), one, Qnil);
   10.71 +      Findent_to (make_fixnum (45), one, Qnil);
   10.72        Fprin1 (XSYMBOL (sym)->function, stream);
   10.73      }
   10.74    buffer_insert_ascstring (buf, "\n");
    11.1 --- a/src/alloc.c	Sat Oct 08 12:26:09 2011 +0100
    11.2 +++ b/src/alloc.c	Sun Oct 09 09:51:57 2011 +0100
    11.3 @@ -1583,9 +1583,9 @@
    11.4    Lisp_Object val = Qnil;
    11.5    Elemcount size;
    11.6  
    11.7 -  check_integer_range (length, Qzero, make_integer (EMACS_INT_MAX));
    11.8 -
    11.9 -  size = XINT (length);
   11.10 +  check_integer_range (length, Qzero, make_integer (MOST_POSITIVE_FIXNUM));
   11.11 +
   11.12 +  size = XFIXNUM (length);
   11.13  
   11.14    while (size--)
   11.15      val = Fcons (object, val);
   11.16 @@ -1862,8 +1862,8 @@
   11.17  */
   11.18         (length, object))
   11.19  {
   11.20 -  check_integer_range (length, Qzero, make_int (ARRAY_DIMENSION_LIMIT));
   11.21 -  return make_vector (XINT (length), object);
   11.22 +  check_integer_range (length, Qzero, make_fixnum (ARRAY_DIMENSION_LIMIT));
   11.23 +  return make_vector (XFIXNUM (length), object);
   11.24  }
   11.25  
   11.26  DEFUN ("vector", Fvector, 0, MANY, 0, /*
   11.27 @@ -2044,8 +2044,8 @@
   11.28  */
   11.29         (length, bit))
   11.30  {
   11.31 -  check_integer_range (length, Qzero, make_int (ARRAY_DIMENSION_LIMIT));
   11.32 -  return make_bit_vector (XINT (length), bit);
   11.33 +  check_integer_range (length, Qzero, make_fixnum (ARRAY_DIMENSION_LIMIT));
   11.34 +  return make_bit_vector (XFIXNUM (length), bit);
   11.35  }
   11.36  
   11.37  DEFUN ("bit-vector", Fbit_vector, 0, MANY, 0, /*
   11.38 @@ -2135,7 +2135,7 @@
   11.39  
   11.40    if (nargs < 4 || nargs > 6)
   11.41      return Fsignal (Qwrong_number_of_arguments,
   11.42 -		    list2 (intern ("make-byte-code"), make_int (nargs)));
   11.43 +		    list2 (intern ("make-byte-code"), make_fixnum (nargs)));
   11.44  
   11.45    /* Check for valid formal parameter list now, to allow us to use
   11.46       SPECBIND_FAST_UNSAFE() later in funcall_compiled_function(). */
   11.47 @@ -2158,7 +2158,7 @@
   11.48    if (CONSP (instructions))
   11.49      {
   11.50        CHECK_STRING (XCAR (instructions));
   11.51 -      CHECK_INT (XCDR (instructions));
   11.52 +      CHECK_FIXNUM (XCDR (instructions));
   11.53      }
   11.54    else
   11.55      {
   11.56 @@ -2170,8 +2170,8 @@
   11.57      CHECK_VECTOR (constants);
   11.58    f->constants = constants;
   11.59  
   11.60 -  check_integer_range (stack_depth, Qzero, make_int (USHRT_MAX));
   11.61 -  f->stack_depth = (unsigned short) XINT (stack_depth);
   11.62 +  check_integer_range (stack_depth, Qzero, make_fixnum (USHRT_MAX));
   11.63 +  f->stack_depth = (unsigned short) XFIXNUM (stack_depth);
   11.64  
   11.65  #ifdef COMPILED_FUNCTION_ANNOTATION_HACK
   11.66    f->annotated = Vload_file_name_internal;
   11.67 @@ -2534,7 +2534,7 @@
   11.68  
   11.69    if (CONSP (*ptr) && EXTENT_INFOP (XCAR (*ptr)))
   11.70      ptr = &XCDR (*ptr);
   11.71 -  if (CONSP (*ptr) && INTP (XCAR (*ptr)))
   11.72 +  if (CONSP (*ptr) && FIXNUMP (XCAR (*ptr)))
   11.73      ptr = &XCDR (*ptr);
   11.74    return ptr;
   11.75  }
   11.76 @@ -3006,26 +3006,26 @@
   11.77  */
   11.78         (length, character))
   11.79  {
   11.80 -  check_integer_range (length, Qzero, make_int (ARRAY_DIMENSION_LIMIT));
   11.81 +  check_integer_range (length, Qzero, make_fixnum (ARRAY_DIMENSION_LIMIT));
   11.82    CHECK_CHAR_COERCE_INT (character);
   11.83    {
   11.84      Ibyte init_str[MAX_ICHAR_LEN];
   11.85      int len = set_itext_ichar (init_str, XCHAR (character));
   11.86 -    Lisp_Object val = make_uninit_string (len * XINT (length));
   11.87 +    Lisp_Object val = make_uninit_string (len * XFIXNUM (length));
   11.88  
   11.89      if (len == 1)
   11.90        {
   11.91  	/* Optimize the single-byte case */
   11.92  	memset (XSTRING_DATA (val), XCHAR (character), XSTRING_LENGTH (val));
   11.93  	XSET_STRING_ASCII_BEGIN (val, min (MAX_STRING_ASCII_BEGIN,
   11.94 -					   len * XINT (length)));
   11.95 +					   len * XFIXNUM (length)));
   11.96        }
   11.97      else
   11.98        {
   11.99  	EMACS_INT i;
  11.100  	Ibyte *ptr = XSTRING_DATA (val);
  11.101  
  11.102 -	for (i = XINT (length); i; i--)
  11.103 +	for (i = XFIXNUM (length); i; i--)
  11.104  	  {
  11.105  	    Ibyte *init_ptr = init_str;
  11.106  	    switch (len)
  11.107 @@ -4046,7 +4046,7 @@
  11.108    /* C doesn't have local functions (or closures, or GC, or readable syntax,
  11.109       or portable numeric datatypes, or bit-vectors, or characters, or
  11.110       arrays, or exceptions, or ...) */
  11.111 -  return cons3 (intern (name), make_int (value), tail);
  11.112 +  return cons3 (intern (name), make_fixnum (value), tail);
  11.113  }
  11.114  
  11.115  /* Pluralize a lowercase English word stored in BUF, assuming BUF has
  11.116 @@ -4230,30 +4230,30 @@
  11.117  #ifdef NEW_GC
  11.118    return
  11.119      list6 
  11.120 -    (Fcons (make_int (lrecord_stats[lrecord_type_cons].instances_in_use),
  11.121 -	    make_int (lrecord_stats[lrecord_type_cons]
  11.122 +    (Fcons (make_fixnum (lrecord_stats[lrecord_type_cons].instances_in_use),
  11.123 +	    make_fixnum (lrecord_stats[lrecord_type_cons]
  11.124  		      .bytes_in_use_including_overhead)),
  11.125 -     Fcons (make_int (lrecord_stats[lrecord_type_symbol].instances_in_use),
  11.126 -	    make_int (lrecord_stats[lrecord_type_symbol]
  11.127 +     Fcons (make_fixnum (lrecord_stats[lrecord_type_symbol].instances_in_use),
  11.128 +	    make_fixnum (lrecord_stats[lrecord_type_symbol]
  11.129  		      .bytes_in_use_including_overhead)),
  11.130 -     Fcons (make_int (lrecord_stats[lrecord_type_marker].instances_in_use),
  11.131 -	    make_int (lrecord_stats[lrecord_type_marker]
  11.132 +     Fcons (make_fixnum (lrecord_stats[lrecord_type_marker].instances_in_use),
  11.133 +	    make_fixnum (lrecord_stats[lrecord_type_marker]
  11.134  		      .bytes_in_use_including_overhead)),
  11.135 -     make_int (lrecord_stats[lrecord_type_string]
  11.136 +     make_fixnum (lrecord_stats[lrecord_type_string]
  11.137  	       .bytes_in_use_including_overhead),
  11.138 -     make_int (lrecord_stats[lrecord_type_vector]
  11.139 +     make_fixnum (lrecord_stats[lrecord_type_vector]
  11.140  	       .bytes_in_use_including_overhead),
  11.141       object_memory_usage_stats (1));
  11.142  #else /* not NEW_GC */
  11.143    return
  11.144 -    list6 (Fcons (make_int (gc_count_num_cons_in_use),
  11.145 -		  make_int (gc_count_num_cons_freelist)),
  11.146 -	   Fcons (make_int (gc_count_num_symbol_in_use),
  11.147 -		  make_int (gc_count_num_symbol_freelist)),
  11.148 -	   Fcons (make_int (gc_count_num_marker_in_use),
  11.149 -		  make_int (gc_count_num_marker_freelist)),
  11.150 -	   make_int (gc_count_string_total_size),
  11.151 -	   make_int (lrecord_stats[lrecord_type_vector].bytes_in_use +
  11.152 +    list6 (Fcons (make_fixnum (gc_count_num_cons_in_use),
  11.153 +		  make_fixnum (gc_count_num_cons_freelist)),
  11.154 +	   Fcons (make_fixnum (gc_count_num_symbol_in_use),
  11.155 +		  make_fixnum (gc_count_num_symbol_freelist)),
  11.156 +	   Fcons (make_fixnum (gc_count_num_marker_in_use),
  11.157 +		  make_fixnum (gc_count_num_marker_freelist)),
  11.158 +	   make_fixnum (gc_count_string_total_size),
  11.159 +	   make_fixnum (lrecord_stats[lrecord_type_vector].bytes_in_use +
  11.160  		     lrecord_stats[lrecord_type_vector].bytes_freed +
  11.161  		     lrecord_stats[lrecord_type_vector].bytes_on_free_list),
  11.162  	   object_memory_usage_stats (1));
  11.163 @@ -4318,9 +4318,9 @@
  11.164    lisp_object_storage_size (object, &object_stats);
  11.165  
  11.166    val = Facons (Qobject_actually_requested,
  11.167 -		make_int (object_stats.was_requested), val);
  11.168 +		make_fixnum (object_stats.was_requested), val);
  11.169    val = Facons (Qobject_malloc_overhead,
  11.170 -		make_int (object_stats.malloc_overhead), val);
  11.171 +		make_fixnum (object_stats.malloc_overhead), val);
  11.172    assert (!object_stats.dynarr_overhead);
  11.173    assert (!object_stats.gap_overhead);
  11.174  
  11.175 @@ -4331,15 +4331,15 @@
  11.176  
  11.177        val = Fcons (Qt, val);
  11.178        val = Facons (Qother_memory_actually_requested,
  11.179 -		    make_int (gustats.u.was_requested), val);
  11.180 +		    make_fixnum (gustats.u.was_requested), val);
  11.181        val = Facons (Qother_memory_malloc_overhead,
  11.182 -		    make_int (gustats.u.malloc_overhead), val);
  11.183 +		    make_fixnum (gustats.u.malloc_overhead), val);
  11.184        if (gustats.u.dynarr_overhead)
  11.185  	val = Facons (Qother_memory_dynarr_overhead,
  11.186 -		      make_int (gustats.u.dynarr_overhead), val);
  11.187 +		      make_fixnum (gustats.u.dynarr_overhead), val);
  11.188        if (gustats.u.gap_overhead)
  11.189  	val = Facons (Qother_memory_gap_overhead,
  11.190 -		      make_int (gustats.u.gap_overhead), val);
  11.191 +		      make_fixnum (gustats.u.gap_overhead), val);
  11.192        val = Fcons (Qnil, val);
  11.193  
  11.194        i = 0;
  11.195 @@ -4350,7 +4350,7 @@
  11.196  	      val = Fcons (item, val);
  11.197  	    else
  11.198  	      {
  11.199 -		val = Facons (item, make_int (gustats.othervals[i]), val);
  11.200 +		val = Facons (item, make_fixnum (gustats.othervals[i]), val);
  11.201  		i++;
  11.202  	      }
  11.203  	  }
  11.204 @@ -4486,7 +4486,7 @@
  11.205  */
  11.206         ())
  11.207  {
  11.208 -  return make_int (total_gc_usage + consing_since_gc);
  11.209 +  return make_fixnum (total_gc_usage + consing_since_gc);
  11.210  }
  11.211  
  11.212  #endif /* ALLOC_TYPE_STATS */
  11.213 @@ -5540,7 +5540,7 @@
  11.214  */
  11.215         ())
  11.216  {
  11.217 -  return make_int (consing_since_gc);
  11.218 +  return make_fixnum (consing_since_gc);
  11.219  }
  11.220  
  11.221  #if 0
  11.222 @@ -5551,7 +5551,7 @@
  11.223  */
  11.224         ())
  11.225  {
  11.226 -  return make_int ((EMACS_INT) sbrk (0) / 1024);
  11.227 +  return make_fixnum ((EMACS_INT) sbrk (0) / 1024);
  11.228  }
  11.229  #endif
  11.230  
  11.231 @@ -5564,7 +5564,7 @@
  11.232  */
  11.233         ())
  11.234  {
  11.235 -  return make_int (total_data_usage ());
  11.236 +  return make_fixnum (total_data_usage ());
  11.237  }
  11.238  
  11.239  #ifdef USE_VALGRIND
  11.240 @@ -5600,7 +5600,7 @@
  11.241  common_init_alloc_early (void)
  11.242  {
  11.243  #ifndef Qzero
  11.244 -  Qzero = make_int (0);	/* Only used if Lisp_Object is a union type */
  11.245 +  Qzero = make_fixnum (0);	/* Only used if Lisp_Object is a union type */
  11.246  #endif
  11.247  
  11.248  #ifndef Qnull_pointer
    12.1 --- a/src/buffer.c	Sat Oct 08 12:26:09 2011 +0100
    12.2 +++ b/src/buffer.c	Sun Oct 09 09:51:57 2011 +0100
    12.3 @@ -636,7 +636,7 @@
    12.4    init_buffer_markers (b);
    12.5    init_buffer_syntax_cache (b);
    12.6  
    12.7 -  b->generated_modeline_string = Fmake_string (make_int (84), make_int (' '));
    12.8 +  b->generated_modeline_string = Fmake_string (make_fixnum (84), make_fixnum (' '));
    12.9    b->modeline_extent_table = make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK,
   12.10                                                     Qeq);
   12.11  
   12.12 @@ -739,7 +739,7 @@
   12.13    /* For each slot that has a default value,
   12.14       copy that into the slot.  */
   12.15  #define MARKED_SLOT(slot)						\
   12.16 -  { int mask = XINT (buffer_local_flags.slot);				\
   12.17 +  { int mask = XFIXNUM (buffer_local_flags.slot);				\
   12.18      if ((mask > 0 || mask == -1 || mask == -3)				\
   12.19  	&& (first_time							\
   12.20  	    || NILP (Fget (XBUFFER (Vbuffer_local_symbols)->slot,	\
   12.21 @@ -889,7 +889,7 @@
   12.22    {
   12.23      struct buffer *syms = XBUFFER (Vbuffer_local_symbols);
   12.24  #define MARKED_SLOT(slot)					\
   12.25 -    { int mask = XINT (buffer_local_flags.slot);		\
   12.26 +    { int mask = XFIXNUM (buffer_local_flags.slot);		\
   12.27        if (mask == 0 || mask == -1				\
   12.28  	  || ((mask > 0) && (buf->local_var_flags & mask)))	\
   12.29          result = Fcons (Fcons (syms->slot, buf->slot), result);	\
   12.30 @@ -969,7 +969,7 @@
   12.31  {
   12.32    struct buffer *buf = decode_buffer (buffer, 0);
   12.33  
   12.34 -  return make_int (BUF_MODIFF (buf));
   12.35 +  return make_fixnum (BUF_MODIFF (buf));
   12.36  }
   12.37  
   12.38  DEFUN ("rename-buffer", Frename_buffer, 1, 2,
   12.39 @@ -1513,7 +1513,7 @@
   12.40        Lisp_Object current_window = Fselected_window (Qnil);
   12.41        if (!NILP (current_window)
   12.42  	  && EQ(Fwindow_buffer (current_window), wrap_buffer (old_buf)))
   12.43 -	Fset_window_point (current_window, make_int (BUF_PT (old_buf)));
   12.44 +	Fset_window_point (current_window, make_fixnum (BUF_PT (old_buf)));
   12.45  
   12.46        /* Put the undo list back in the base buffer, so that it appears
   12.47  	 that an indirect buffer shares the undo list of its base.  */
   12.48 @@ -1816,7 +1816,7 @@
   12.49    b = XBUFFER (buffer);
   12.50  
   12.51  #define ADD_INT(field) \
   12.52 -  plist = cons3 (make_int (b->text->field), \
   12.53 +  plist = cons3 (make_fixnum (b->text->field), \
   12.54  		 intern_massaging_name (#field), plist)
   12.55  #define ADD_BOOL(field) \
   12.56    plist = cons3 (b->text->field ? Qt : Qnil, \
   12.57 @@ -1843,11 +1843,11 @@
   12.58      Lisp_Object pos[NUM_CACHED_POSITIONS];
   12.59      int i;
   12.60      for (i = 0; i < b->text->next_cache_pos; i++)
   12.61 -      pos[i] = make_int (b->text->mule_charbpos_cache[i]);
   12.62 +      pos[i] = make_fixnum (b->text->mule_charbpos_cache[i]);
   12.63      plist = cons3 (Flist (b->text->next_cache_pos, pos),
   12.64  		   intern ("mule-charbpos-cache"), plist);
   12.65      for (i = 0; i < b->text->next_cache_pos; i++)
   12.66 -      pos[i] = make_int (b->text->mule_bytebpos_cache[i]);
   12.67 +      pos[i] = make_fixnum (b->text->mule_bytebpos_cache[i]);
   12.68      plist = cons3 (Flist (b->text->next_cache_pos, pos),
   12.69  		   intern ("mule-bytebpos-cache"), plist);
   12.70    }
   12.71 @@ -1866,9 +1866,9 @@
   12.72    Lisp_Object plist = Qnil;
   12.73    CHECK_STRING (string);
   12.74  
   12.75 -  plist = cons3 (make_int (XSTRING_LENGTH (string)),
   12.76 +  plist = cons3 (make_fixnum (XSTRING_LENGTH (string)),
   12.77  		 intern ("byte-length"), plist);
   12.78 -  plist = cons3 (make_int (XSTRING_ASCII_BEGIN (string)),
   12.79 +  plist = cons3 (make_fixnum (XSTRING_ASCII_BEGIN (string)),
   12.80  		 intern ("ascii-begin"), plist);
   12.81  
   12.82    return Fnreverse (plist);
   12.83 @@ -2243,9 +2243,9 @@
   12.84    defs->modeline_format = build_ascstring ("%-");  /* reset in loaddefs.el */
   12.85    defs->case_fold_search = Qt;
   12.86    defs->selective_display_ellipses = Qt;
   12.87 -  defs->tab_width = make_int (8);
   12.88 +  defs->tab_width = make_fixnum (8);
   12.89    defs->ctl_arrow = Qt;
   12.90 -  defs->fill_column = make_int (70);
   12.91 +  defs->fill_column = make_fixnum (70);
   12.92    defs->left_margin = Qzero;
   12.93    defs->saved_size = Qzero;	/* lisp code wants int-or-nil */
   12.94    defs->modtime = 0;
   12.95 @@ -2267,9 +2267,9 @@
   12.96       * >0 is mask.  Var is local if ((buffer->local_var_flags & mask) != 0)
   12.97       *              Otherwise default is used.
   12.98       */
   12.99 -    Lisp_Object always_local_no_default = make_int (0);
  12.100 -    Lisp_Object always_local_resettable = make_int (-1);
  12.101 -    Lisp_Object resettable		= make_int (-3);
  12.102 +    Lisp_Object always_local_no_default = make_fixnum (0);
  12.103 +    Lisp_Object always_local_resettable = make_fixnum (-1);
  12.104 +    Lisp_Object resettable		= make_fixnum (-3);
  12.105  
  12.106      /* Assign the local-flags to the slots that have default values.
  12.107         The local flag is a bit that is used in the buffer
  12.108 @@ -2279,7 +2279,7 @@
  12.109  
  12.110      set_lheader_implementation ((struct lrecord_header *)
  12.111  				&buffer_local_flags, &lrecord_buffer);
  12.112 -    nuke_all_buffer_slots (&buffer_local_flags, make_int (-2));
  12.113 +    nuke_all_buffer_slots (&buffer_local_flags, make_fixnum (-2));
  12.114      buffer_local_flags.filename		   = always_local_no_default;
  12.115      buffer_local_flags.directory	   = always_local_no_default;
  12.116      buffer_local_flags.backed_up	   = always_local_no_default;
  12.117 @@ -2306,28 +2306,28 @@
  12.118      buffer_local_flags.category_table	= resettable;
  12.119  #endif
  12.120      buffer_local_flags.display_time     = always_local_no_default;
  12.121 -    buffer_local_flags.display_count    = make_int (0);
  12.122 -
  12.123 -    buffer_local_flags.modeline_format		  = make_int (1<<0);
  12.124 -    buffer_local_flags.abbrev_mode		  = make_int (1<<1);
  12.125 -    buffer_local_flags.overwrite_mode		  = make_int (1<<2);
  12.126 -    buffer_local_flags.case_fold_search		  = make_int (1<<3);
  12.127 -    buffer_local_flags.auto_fill_function	  = make_int (1<<4);
  12.128 -    buffer_local_flags.selective_display	  = make_int (1<<5);
  12.129 -    buffer_local_flags.selective_display_ellipses = make_int (1<<6);
  12.130 -    buffer_local_flags.tab_width		  = make_int (1<<7);
  12.131 -    buffer_local_flags.truncate_lines		  = make_int (1<<8);
  12.132 -    buffer_local_flags.ctl_arrow		  = make_int (1<<9);
  12.133 -    buffer_local_flags.fill_column		  = make_int (1<<10);
  12.134 -    buffer_local_flags.left_margin		  = make_int (1<<11);
  12.135 -    buffer_local_flags.abbrev_table		  = make_int (1<<12);
  12.136 +    buffer_local_flags.display_count    = make_fixnum (0);
  12.137 +
  12.138 +    buffer_local_flags.modeline_format		  = make_fixnum (1<<0);
  12.139 +    buffer_local_flags.abbrev_mode		  = make_fixnum (1<<1);
  12.140 +    buffer_local_flags.overwrite_mode		  = make_fixnum (1<<2);
  12.141 +    buffer_local_flags.case_fold_search		  = make_fixnum (1<<3);
  12.142 +    buffer_local_flags.auto_fill_function	  = make_fixnum (1<<4);
  12.143 +    buffer_local_flags.selective_display	  = make_fixnum (1<<5);
  12.144 +    buffer_local_flags.selective_display_ellipses = make_fixnum (1<<6);
  12.145 +    buffer_local_flags.tab_width		  = make_fixnum (1<<7);
  12.146 +    buffer_local_flags.truncate_lines		  = make_fixnum (1<<8);
  12.147 +    buffer_local_flags.ctl_arrow		  = make_fixnum (1<<9);
  12.148 +    buffer_local_flags.fill_column		  = make_fixnum (1<<10);
  12.149 +    buffer_local_flags.left_margin		  = make_fixnum (1<<11);
  12.150 +    buffer_local_flags.abbrev_table		  = make_fixnum (1<<12);
  12.151  #ifdef REGION_CACHE_NEEDS_WORK
  12.152 -    buffer_local_flags.cache_long_line_scans	  = make_int (1<<13);
  12.153 +    buffer_local_flags.cache_long_line_scans	  = make_fixnum (1<<13);
  12.154  #endif
  12.155 -    buffer_local_flags.buffer_file_coding_system  = make_int (1<<14);
  12.156 +    buffer_local_flags.buffer_file_coding_system  = make_fixnum (1<<14);
  12.157  
  12.158      /* #### Warning: 1<<31 is the largest number currently allowable
  12.159 -       due to the XINT() handling of this value.  With some
  12.160 +       due to the XFIXNUM() handling of this value.  With some
  12.161         rearrangement you can get 3 more bits.
  12.162  
  12.163         #### 3 more?  34 bits???? -ben */
  12.164 @@ -2867,8 +2867,8 @@
  12.165       slot of buffer_local_flags and vice-versa.  Must be done after all
  12.166       DEFVAR_BUFFER_LOCAL() calls. */
  12.167  #define MARKED_SLOT(slot)					\
  12.168 -  assert ((XINT (buffer_local_flags.slot) != -2 &&		\
  12.169 -           XINT (buffer_local_flags.slot) != -3)		\
  12.170 +  assert ((XFIXNUM (buffer_local_flags.slot) != -2 &&		\
  12.171 +           XFIXNUM (buffer_local_flags.slot) != -3)		\
  12.172  	  == !(NILP (XBUFFER (Vbuffer_local_symbols)->slot)));
  12.173  #include "bufslots.h"
  12.174  
    13.1 --- a/src/buffer.h	Sat Oct 08 12:26:09 2011 +0100
    13.2 +++ b/src/buffer.h	Sun Oct 09 09:51:57 2011 +0100
    13.3 @@ -647,7 +647,7 @@
    13.4  
    13.5  /* Given a Bytebpos, return the equivalent Charbpos as a Lisp Object. */
    13.6  
    13.7 -#define make_charbpos(buf, ind) make_int (bytebpos_to_charbpos (buf, ind))
    13.8 +#define make_charbpos(buf, ind) make_fixnum (bytebpos_to_charbpos (buf, ind))
    13.9  
   13.10  /*----------------------------------------------------------------------*/
   13.11  /*	    Converting between byte and memory positions		*/
    14.1 --- a/src/bytecode.c	Sat Oct 08 12:26:09 2011 +0100
    14.2 +++ b/src/bytecode.c	Sun Oct 09 09:51:57 2011 +0100
    14.3 @@ -223,9 +223,9 @@
    14.4    if (byte_metering_on)
    14.5      {
    14.6        Lisp_Object *p = XVECTOR_DATA (XVECTOR_DATA (Vbyte_code_meter)[this_opcode]);
    14.7 -      p[0] = INT_PLUS1 (p[0]);
    14.8 +      p[0] = FIXNUM_PLUS1 (p[0]);
    14.9        if (prev_opcode)
   14.10 -	p[prev_opcode] = INT_PLUS1 (p[prev_opcode]);
   14.11 +	p[prev_opcode] = FIXNUM_PLUS1 (p[prev_opcode]);
   14.12      }
   14.13  }
   14.14  
   14.15 @@ -237,7 +237,7 @@
   14.16  {
   14.17   retry:
   14.18  
   14.19 -  if (INTP    (obj)) return make_integer (- XINT (obj));
   14.20 +  if (FIXNUMP    (obj)) return make_integer (- XFIXNUM (obj));
   14.21    if (FLOATP  (obj)) return make_float (- XFLOAT_DATA (obj));
   14.22    if (CHARP   (obj)) return make_integer (- ((int) XCHAR (obj)));
   14.23    if (MARKERP (obj)) return make_integer (- ((int) marker_position (obj)));
   14.24 @@ -291,7 +291,7 @@
   14.25      {
   14.26      case FIXNUM_T:
   14.27        {
   14.28 -	EMACS_INT ival1 = XREALINT (obj1), ival2 = XREALINT (obj2);
   14.29 +	EMACS_INT ival1 = XREALFIXNUM (obj1), ival2 = XREALFIXNUM (obj2);
   14.30  	return ival1 < ival2 ? -1 : ival1 > ival2 ? 1 : 0;
   14.31        }
   14.32  #ifdef HAVE_BIGNUM
   14.33 @@ -318,12 +318,12 @@
   14.34    {
   14.35      EMACS_INT ival1, ival2;
   14.36  
   14.37 -    if      (INTP    (obj1)) ival1 = XINT  (obj1);
   14.38 +    if      (FIXNUMP    (obj1)) ival1 = XFIXNUM  (obj1);
   14.39      else if (CHARP   (obj1)) ival1 = XCHAR (obj1);
   14.40      else if (MARKERP (obj1)) ival1 = marker_position (obj1);
   14.41      else goto arithcompare_float;
   14.42  
   14.43 -    if      (INTP    (obj2)) ival2 = XINT  (obj2);
   14.44 +    if      (FIXNUMP    (obj2)) ival2 = XFIXNUM  (obj2);
   14.45      else if (CHARP   (obj2)) ival2 = XCHAR (obj2);
   14.46      else if (MARKERP (obj2)) ival2 = marker_position (obj2);
   14.47      else goto arithcompare_float;
   14.48 @@ -337,7 +337,7 @@
   14.49      double dval1, dval2;
   14.50  
   14.51      if      (FLOATP  (obj1)) dval1 = XFLOAT_DATA (obj1);
   14.52 -    else if (INTP    (obj1)) dval1 = (double) XINT  (obj1);
   14.53 +    else if (FIXNUMP    (obj1)) dval1 = (double) XFIXNUM  (obj1);
   14.54      else if (CHARP   (obj1)) dval1 = (double) XCHAR (obj1);
   14.55      else if (MARKERP (obj1)) dval1 = (double) marker_position (obj1);
   14.56      else
   14.57 @@ -347,7 +347,7 @@
   14.58        }
   14.59  
   14.60      if      (FLOATP  (obj2)) dval2 = XFLOAT_DATA (obj2);
   14.61 -    else if (INTP    (obj2)) dval2 = (double) XINT  (obj2);
   14.62 +    else if (FIXNUMP    (obj2)) dval2 = (double) XFIXNUM  (obj2);
   14.63      else if (CHARP   (obj2)) dval2 = (double) XCHAR (obj2);
   14.64      else if (MARKERP (obj2)) dval2 = (double) marker_position (obj2);
   14.65      else
   14.66 @@ -369,7 +369,7 @@
   14.67      {
   14.68      case FIXNUM_T:
   14.69        {
   14.70 -	EMACS_INT ival1 = XREALINT (obj1), ival2 = XREALINT (obj2);
   14.71 +	EMACS_INT ival1 = XREALFIXNUM (obj1), ival2 = XREALFIXNUM (obj2);
   14.72  	switch (opcode)
   14.73  	  {
   14.74  	  case Bplus: ival1 += ival2; break;
   14.75 @@ -512,7 +512,7 @@
   14.76  
   14.77    float_p = 0;
   14.78  
   14.79 -  if      (INTP    (obj1)) ival1 = XINT  (obj1);
   14.80 +  if      (FIXNUMP    (obj1)) ival1 = XFIXNUM  (obj1);
   14.81    else if (CHARP   (obj1)) ival1 = XCHAR (obj1);
   14.82    else if (MARKERP (obj1)) ival1 = marker_position (obj1);
   14.83    else if (FLOATP  (obj1)) ival1 = 0, float_p = 1;
   14.84 @@ -522,7 +522,7 @@
   14.85        goto retry;
   14.86      }
   14.87  
   14.88 -  if      (INTP    (obj2)) ival2 = XINT  (obj2);
   14.89 +  if      (FIXNUMP    (obj2)) ival2 = XFIXNUM  (obj2);
   14.90    else if (CHARP   (obj2)) ival2 = XCHAR (obj2);
   14.91    else if (MARKERP (obj2)) ival2 = marker_position (obj2);
   14.92    else if (FLOATP  (obj2)) ival2 = 0, float_p = 1;
   14.93 @@ -547,7 +547,7 @@
   14.94  	case Bmax:  if (ival1 < ival2) ival1 = ival2; break;
   14.95  	case Bmin:  if (ival1 > ival2) ival1 = ival2; break;
   14.96  	}
   14.97 -      return make_int (ival1);
   14.98 +      return make_fixnum (ival1);
   14.99      }
  14.100    else
  14.101      {
  14.102 @@ -925,8 +925,8 @@
  14.103  	  if (byte_metering_on && SYMBOLP (TOP))
  14.104  	    {
  14.105  	      Lisp_Object val = Fget (TOP, Qbyte_code_meter, Qnil);
  14.106 -	      if (INTP (val))
  14.107 -		Fput (TOP, Qbyte_code_meter, make_int (XINT (val) + 1));
  14.108 +	      if (FIXNUMP (val))
  14.109 +		Fput (TOP, Qbyte_code_meter, make_fixnum (XFIXNUM (val) + 1));
  14.110  	    }
  14.111  #endif
  14.112            TOP_LVALUE = TOP; /* Ignore multiple values. */
  14.113 @@ -1103,12 +1103,12 @@
  14.114  #ifdef WITH_NUMBER_TYPES
  14.115  	  TOP_LVALUE = NUMBERP (TOP) ? Qt : Qnil;
  14.116  #else
  14.117 -	  TOP_LVALUE = INT_OR_FLOATP (TOP) ? Qt : Qnil;
  14.118 +	  TOP_LVALUE = FIXNUM_OR_FLOATP (TOP) ? Qt : Qnil;
  14.119  #endif
  14.120  	  break;
  14.121  
  14.122  	case Bfixnump:
  14.123 -	  TOP_LVALUE = INTP (TOP) ? Qt : Qnil;
  14.124 +	  TOP_LVALUE = FIXNUMP (TOP) ? Qt : Qnil;
  14.125  	  break;
  14.126  
  14.127  	case Beq:
  14.128 @@ -1211,7 +1211,7 @@
  14.129              TOP_LVALUE = Fsub1 (TOP);
  14.130  #else
  14.131              Lisp_Object arg = TOP;
  14.132 -            TOP_LVALUE = INTP (arg) ? INT_MINUS1 (arg) : Fsub1 (arg);
  14.133 +            TOP_LVALUE = FIXNUMP (arg) ? FIXNUM_MINUS1 (arg) : Fsub1 (arg);
  14.134  #endif
  14.135  	  break;
  14.136            }
  14.137 @@ -1221,7 +1221,7 @@
  14.138              TOP_LVALUE = Fadd1 (TOP);
  14.139  #else
  14.140              Lisp_Object arg = TOP;
  14.141 -            TOP_LVALUE = INTP (arg) ? INT_PLUS1 (arg) : Fadd1 (arg);
  14.142 +            TOP_LVALUE = FIXNUMP (arg) ? FIXNUM_PLUS1 (arg) : Fadd1 (arg);
  14.143  #endif
  14.144  	  break;
  14.145            }
  14.146 @@ -1281,8 +1281,8 @@
  14.147  #ifdef HAVE_BIGNUM
  14.148  	    TOP_LVALUE = bytecode_arithop (arg1, arg2, opcode);
  14.149  #else
  14.150 -	    TOP_LVALUE = INTP (arg1) && INTP (arg2) ?
  14.151 -	      INT_PLUS (arg1, arg2) :
  14.152 +	    TOP_LVALUE = FIXNUMP (arg1) && FIXNUMP (arg2) ?
  14.153 +	      FIXNUM_PLUS (arg1, arg2) :
  14.154  	      bytecode_arithop (arg1, arg2, opcode);
  14.155  #endif
  14.156  	    break;
  14.157 @@ -1295,8 +1295,8 @@
  14.158  #ifdef HAVE_BIGNUM
  14.159  	    TOP_LVALUE = bytecode_arithop (arg1, arg2, opcode);
  14.160  #else
  14.161 -	    TOP_LVALUE = INTP (arg1) && INTP (arg2) ?
  14.162 -	      INT_MINUS (arg1, arg2) :
  14.163 +	    TOP_LVALUE = FIXNUMP (arg1) && FIXNUMP (arg2) ?
  14.164 +	      FIXNUM_MINUS (arg1, arg2) :
  14.165  	      bytecode_arithop (arg1, arg2, opcode);
  14.166  #endif
  14.167  	    break;
  14.168 @@ -1313,7 +1313,7 @@
  14.169  	  }
  14.170  
  14.171  	case Bpoint:
  14.172 -	  PUSH (make_int (BUF_PT (current_buffer)));
  14.173 +	  PUSH (make_fixnum (BUF_PT (current_buffer)));
  14.174  	  break;
  14.175  
  14.176  	case Binsert:
  14.177 @@ -1407,11 +1407,11 @@
  14.178  	  break;
  14.179  
  14.180  	case Bpoint_max:
  14.181 -	  PUSH (make_int (BUF_ZV (current_buffer)));
  14.182 +	  PUSH (make_fixnum (BUF_ZV (current_buffer)));
  14.183  	  break;
  14.184  
  14.185  	case Bpoint_min:
  14.186 -	  PUSH (make_int (BUF_BEGV (current_buffer)));
  14.187 +	  PUSH (make_fixnum (BUF_BEGV (current_buffer)));
  14.188  	  break;
  14.189  
  14.190  	case Bskip_chars_forward:
  14.191 @@ -1592,7 +1592,7 @@
  14.192        }
  14.193  
  14.194      case Bcurrent_column:
  14.195 -      PUSH (make_int (current_column (current_buffer)));
  14.196 +      PUSH (make_fixnum (current_column (current_buffer)));
  14.197        break;
  14.198  
  14.199      case Bchar_after:
  14.200 @@ -1744,8 +1744,8 @@
  14.201                               make_integer (Vmultiple_values_limit));
  14.202          check_integer_range (first, Qzero, upper);
  14.203  
  14.204 -        speccount = make_int (bind_multiple_value_limits (XINT (first),
  14.205 -                                                          XINT (upper)));
  14.206 +        speccount = make_fixnum (bind_multiple_value_limits (XFIXNUM (first),
  14.207 +                                                          XFIXNUM (upper)));
  14.208          PUSH (upper);
  14.209          PUSH (speccount);
  14.210          break;
  14.211 @@ -1753,7 +1753,7 @@
  14.212  
  14.213      case Bmultiple_value_call:
  14.214        {
  14.215 -        n = XINT (POP);
  14.216 +        n = XFIXNUM (POP);
  14.217          DISCARD_PRESERVING_MULTIPLE_VALUES_UNSAFE (n - 1);
  14.218          /* Discard multiple values for the first (function) argument: */
  14.219          TOP_LVALUE = TOP;
  14.220 @@ -1803,7 +1803,7 @@
  14.221        (opcode == 0251)   ||
  14.222        (opcode > Bassq && opcode < Bconstant))
  14.223      invalid_byte_code ("invalid opcode in instruction stream",
  14.224 -		       make_int (opcode));
  14.225 +		       make_fixnum (opcode));
  14.226  }
  14.227  
  14.228  /* Check that IDX is a valid offset into the `constants' vector */
  14.229 @@ -2240,7 +2240,7 @@
  14.230        program = alloca_array (Opbyte, 1 + 2 * XSTRING_LENGTH (f->instructions));
  14.231        optimize_byte_code (f->instructions, f->constants,
  14.232  			  program, &program_length, &varbind_count);
  14.233 -      f->specpdl_depth = (unsigned short) (XINT (Flength (f->arglist)) +
  14.234 +      f->specpdl_depth = (unsigned short) (XFIXNUM (Flength (f->arglist)) +
  14.235                                             varbind_count);
  14.236        f->instructions =
  14.237  	make_opaque (program, program_length * sizeof (Opbyte));
  14.238 @@ -2657,7 +2657,7 @@
  14.239  set_compiled_function_documentation (Lisp_Compiled_Function *f,
  14.240  				     Lisp_Object new_doc)
  14.241  {
  14.242 -  assert (INTP (new_doc) || STRINGP (new_doc));
  14.243 +  assert (FIXNUMP (new_doc) || STRINGP (new_doc));
  14.244  
  14.245    if (f->flags.documentationp)
  14.246      {
  14.247 @@ -2759,7 +2759,7 @@
  14.248         (function))
  14.249  {
  14.250    CHECK_COMPILED_FUNCTION (function);
  14.251 -  return make_int (compiled_function_stack_depth (XCOMPILED_FUNCTION (function)));
  14.252 +  return make_fixnum (compiled_function_stack_depth (XCOMPILED_FUNCTION (function)));
  14.253  }
  14.254  
  14.255  DEFUN ("compiled-function-doc-string", Fcompiled_function_doc_string, 1, 1, 0, /*
  14.256 @@ -2881,7 +2881,7 @@
  14.257  
  14.258    CHECK_STRING (instructions);
  14.259    CHECK_VECTOR (constants);
  14.260 -  check_integer_range (stack_depth, Qzero, make_int (USHRT_MAX));
  14.261 +  check_integer_range (stack_depth, Qzero, make_fixnum (USHRT_MAX));
  14.262  
  14.263    /* Optimize the `instructions' string, just like when executing a
  14.264       regular compiled function, but don't save it for later since this is
  14.265 @@ -2894,7 +2894,7 @@
  14.266  #ifdef ERROR_CHECK_BYTE_CODE
  14.267  				    program_length,
  14.268  #endif
  14.269 -				    XINT (stack_depth),
  14.270 +				    XFIXNUM (stack_depth),
  14.271  				    XVECTOR_DATA (constants));
  14.272  }
  14.273  
    15.1 --- a/src/callint.c	Sat Oct 08 12:26:09 2011 +0100
    15.2 +++ b/src/callint.c	Sun Oct 09 09:51:57 2011 +0100
    15.3 @@ -966,7 +966,7 @@
    15.4         temporarily, convert it to an integer now.  */
    15.5      for (argnum = 0; argnum < argcount; argnum++)
    15.6        if (!NILP (varies[argnum]))
    15.7 -	args[argnum] = make_int (marker_position (args[argnum]));
    15.8 +	args[argnum] = make_fixnum (marker_position (args[argnum]));
    15.9  
   15.10      single_console_state ();
   15.11      specbind (Qcommand_debug_status, Qnil);
   15.12 @@ -986,15 +986,15 @@
   15.13         (raw))
   15.14  {
   15.15    if (NILP (raw))
   15.16 -    return make_int (1);
   15.17 +    return make_fixnum (1);
   15.18    if (EQ (raw, Qminus))
   15.19 -    return make_int (-1);
   15.20 -  if (INTP (raw))
   15.21 +    return make_fixnum (-1);
   15.22 +  if (FIXNUMP (raw))
   15.23      return raw;
   15.24 -  if (CONSP (raw) && INTP (XCAR (raw)))
   15.25 +  if (CONSP (raw) && FIXNUMP (XCAR (raw)))
   15.26      return XCAR (raw);
   15.27  
   15.28 -  return make_int (1);
   15.29 +  return make_fixnum (1);
   15.30  }
   15.31  
   15.32  void
    16.1 --- a/src/casefiddle.c	Sat Oct 08 12:26:09 2011 +0100
    16.2 +++ b/src/casefiddle.c	Sun Oct 09 09:51:57 2011 +0100
    16.3 @@ -309,13 +309,13 @@
    16.4    Charbpos farend;
    16.5    struct buffer *buf = decode_buffer (buffer, 1);
    16.6  
    16.7 -  CHECK_INT (arg);
    16.8 +  CHECK_FIXNUM (arg);
    16.9  
   16.10 -  farend = scan_words (buf, BUF_PT (buf), XINT (arg));
   16.11 +  farend = scan_words (buf, BUF_PT (buf), XFIXNUM (arg));
   16.12    if (!farend)
   16.13 -    farend = XINT (arg) > 0 ? BUF_ZV (buf) : BUF_BEGV (buf);
   16.14 +    farend = XFIXNUM (arg) > 0 ? BUF_ZV (buf) : BUF_BEGV (buf);
   16.15  
   16.16 -  casify_region_internal (flag, make_int (BUF_PT (buf)), make_int (farend), buf);
   16.17 +  casify_region_internal (flag, make_fixnum (BUF_PT (buf)), make_fixnum (farend), buf);
   16.18    BUF_SET_PT (buf, max (BUF_PT (buf), farend));
   16.19    return Qnil;
   16.20  }
    17.1 --- a/src/chartab.c	Sat Oct 08 12:26:09 2011 +0100
    17.2 +++ b/src/chartab.c	Sun Oct 09 09:51:57 2011 +0100
    17.3 @@ -159,10 +159,10 @@
    17.4        }
    17.5      case CHARTAB_RANGE_ROW:
    17.6        {
    17.7 -        if (EQ (old, make_int (range->row)) == test_not_unboundp)
    17.8 +        if (EQ (old, make_fixnum (range->row)) == test_not_unboundp)
    17.9            {
   17.10 -            CHECK_INT (new_);
   17.11 -            changed.row = XINT (new_);
   17.12 +            CHECK_FIXNUM (new_);
   17.13 +            changed.row = XFIXNUM (new_);
   17.14  
   17.15              put_char_table (table, range, Qunbound);
   17.16              put_char_table (table, &changed, value);
   17.17 @@ -364,8 +364,8 @@
   17.18  			     range);
   17.19        outrange->type = CHARTAB_RANGE_ROW;
   17.20        outrange->charset = Fget_charset (elts[0]);
   17.21 -      CHECK_INT (elts[1]);
   17.22 -      outrange->row = XINT (elts[1]);
   17.23 +      CHECK_FIXNUM (elts[1]);
   17.24 +      outrange->row = XFIXNUM (elts[1]);
   17.25        switch (XCHARSET_TYPE (outrange->charset))
   17.26  	{
   17.27  	case CHARSET_TYPE_94:
   17.28 @@ -373,12 +373,12 @@
   17.29  	  sferror ("Charset in row vector must be multi-byte",
   17.30  			       outrange->charset);
   17.31  	case CHARSET_TYPE_94X94:
   17.32 -	  check_integer_range (make_int (outrange->row), make_int (33),
   17.33 -                               make_int (126));
   17.34 +	  check_integer_range (make_fixnum (outrange->row), make_fixnum (33),
   17.35 +                               make_fixnum (126));
   17.36  	  break;
   17.37  	case CHARSET_TYPE_96X96:
   17.38 -	  check_integer_range (make_int (outrange->row), make_int (32),
   17.39 -                               make_int (127));
   17.40 +	  check_integer_range (make_fixnum (outrange->row), make_fixnum (32),
   17.41 +                               make_fixnum (127));
   17.42  	  break;
   17.43  	default:
   17.44  	  ABORT ();
   17.45 @@ -409,7 +409,7 @@
   17.46  
   17.47      case CHARTAB_RANGE_ROW:
   17.48        return vector2 (XCHARSET_NAME (Fget_charset (range->charset)),
   17.49 -		      make_int (range->row));
   17.50 +		      make_fixnum (range->row));
   17.51  #endif
   17.52      case CHARTAB_RANGE_CHAR:
   17.53        return make_char (range->ch);
   17.54 @@ -731,7 +731,7 @@
   17.55        /* Qgeneric not Qsyntax because a syntax table has a mirror table
   17.56  	 and we don't want infinite recursion */
   17.57        ct->mirror_table = Fmake_char_table (Qgeneric);
   17.58 -      set_char_table_default (ct->mirror_table, make_int (Sword));
   17.59 +      set_char_table_default (ct->mirror_table, make_fixnum (Sword));
   17.60        XCHAR_TABLE (ct->mirror_table)->mirror_table_p = 1;
   17.61        XCHAR_TABLE (ct->mirror_table)->mirror_table = obj;
   17.62      }
   17.63 @@ -832,7 +832,7 @@
   17.64    if (!EQ (ct->mirror_table, Qnil))
   17.65      {
   17.66        ctnew->mirror_table = Fmake_char_table (Qgeneric);
   17.67 -      set_char_table_default (ctnew->mirror_table, make_int (Sword));
   17.68 +      set_char_table_default (ctnew->mirror_table, make_fixnum (Sword));
   17.69        XCHAR_TABLE (ctnew->mirror_table)->mirror_table = obj;
   17.70        XCHAR_TABLE (ctnew->mirror_table)->mirror_table_p = 1;
   17.71        XCHAR_TABLE (ctnew->mirror_table)->dirty = 1;
   17.72 @@ -1076,16 +1076,16 @@
   17.73      {
   17.74      case CHAR_TABLE_TYPE_SYNTAX:
   17.75        if (!ERRB_EQ (errb, ERROR_ME))
   17.76 -	return INTP (value) || (CONSP (value) && INTP (XCAR (value))
   17.77 +	return FIXNUMP (value) || (CONSP (value) && FIXNUMP (XCAR (value))
   17.78  				&& CHAR_OR_CHAR_INTP (XCDR (value)));
   17.79        if (CONSP (value))
   17.80          {
   17.81  	  Lisp_Object cdr = XCDR (value);
   17.82 -          CHECK_INT (XCAR (value));
   17.83 +          CHECK_FIXNUM (XCAR (value));
   17.84  	  CHECK_CHAR_COERCE_INT (cdr);
   17.85           }
   17.86        else
   17.87 -        CHECK_INT (value);
   17.88 +        CHECK_FIXNUM (value);
   17.89        break;
   17.90  
   17.91  #ifdef MULE
   17.92 @@ -1853,11 +1853,11 @@
   17.93    int des;
   17.94    struct buffer *buf = decode_buffer (buffer, 0);
   17.95  
   17.96 -  CHECK_INT (position);
   17.97 +  CHECK_FIXNUM (position);
   17.98    CHECK_CATEGORY_DESIGNATOR (designator);
   17.99    des = XCHAR (designator);
  17.100    ctbl = check_category_table (category_table, buf->category_table);
  17.101 -  ch = BUF_FETCH_CHAR (buf, XINT (position));
  17.102 +  ch = BUF_FETCH_CHAR (buf, XFIXNUM (position));
  17.103    return check_category_char (ch, ctbl, des, 0) ? Qt : Qnil;
  17.104  }
  17.105  
  17.106 @@ -1922,7 +1922,7 @@
  17.107    category_table = check_category_table (category_table, Qnil);
  17.108    buf->category_table = category_table;
  17.109    /* Indicate that this buffer now has a specified category table.  */
  17.110 -  buf->local_var_flags |= XINT (buffer_local_flags.category_table);
  17.111 +  buf->local_var_flags |= XFIXNUM (buffer_local_flags.category_table);
  17.112    return category_table;
  17.113  }
  17.114  
    18.1 --- a/src/cmdloop.c	Sat Oct 08 12:26:09 2011 +0100
    18.2 +++ b/src/cmdloop.c	Sun Oct 09 09:51:57 2011 +0100
    18.3 @@ -164,7 +164,7 @@
    18.4    Fmswindows_message_box (build_msg_string ("Initialization error"),
    18.5  			  Qnil, Qnil);
    18.6  #endif
    18.7 -  Fkill_emacs (make_int (-1));
    18.8 +  Fkill_emacs (make_fixnum (-1));
    18.9    RETURN_NOT_REACHED (Qnil);
   18.10  }
   18.11  
   18.12 @@ -249,7 +249,7 @@
   18.13      {
   18.14        message ("\ntemacs can only be run in -batch mode.");
   18.15        noninteractive = 1; /* prevent things under kill-emacs from blowing up */
   18.16 -      Fkill_emacs (make_int (-1));
   18.17 +      Fkill_emacs (make_fixnum (-1));
   18.18      }
   18.19  #else
   18.20    else if (purify_flag)
   18.21 @@ -321,7 +321,7 @@
   18.22    if (!noninteractive &&
   18.23        (!CONSOLEP (Vselected_console) ||
   18.24         CONSOLE_STREAM_P (XCONSOLE (Vselected_console))))
   18.25 -    Fkill_emacs (make_int (-1));
   18.26 +    Fkill_emacs (make_fixnum (-1));
   18.27  
   18.28    /* End of -batch run causes exit here. */
   18.29    if (noninteractive)
   18.30 @@ -481,7 +481,7 @@
   18.31  
   18.32    message ("Error in command-loop!!");
   18.33    Fset (intern ("last-error"), datum); /* #### Better/different name? */
   18.34 -  Fsit_for (make_int (2), Qnil);
   18.35 +  Fsit_for (make_fixnum (2), Qnil);
   18.36    cold_load_command_error (datum, Qnil);
   18.37    return (Qt);
   18.38  }
   18.39 @@ -494,7 +494,7 @@
   18.40      {
   18.41        if (!NILP (condition_case_1 (Qt, load1, load_me,
   18.42                                     initial_error_handler, Qnil)))
   18.43 -	Fkill_emacs (make_int (-1));
   18.44 +	Fkill_emacs (make_fixnum (-1));
   18.45      }
   18.46  
   18.47    for (;;)
   18.48 @@ -568,7 +568,7 @@
   18.49       compatibility with Emacs 18.  It's not even clear what the "right
   18.50       thing" is. */
   18.51    if (!((STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))
   18.52 -	&& XINT (Flength (Vexecuting_macro)) == 1))
   18.53 +	&& XFIXNUM (Flength (Vexecuting_macro)) == 1))
   18.54      Vlast_command = Qt;
   18.55  
   18.56  #ifndef LISP_COMMAND_LOOP
   18.57 @@ -613,7 +613,7 @@
   18.58  	  if (!NILP (Vminibuffer_echo_wait_function))
   18.59  	    call0 (Vminibuffer_echo_wait_function);
   18.60  	  else
   18.61 -	    Fsit_for (make_int (2), Qnil);
   18.62 +	    Fsit_for (make_fixnum (2), Qnil);
   18.63  	  clear_echo_area (selected_frame (), Qnil, 0);
   18.64  	  Vquit_flag = Qnil; /* see begin_dont_check_for_quit() */
   18.65  	  unbind_to (count);
    19.1 --- a/src/cmds.c	Sat Oct 08 12:26:09 2011 +0100
    19.2 +++ b/src/cmds.c	Sun Oct 09 09:51:57 2011 +0100
    19.3 @@ -65,11 +65,11 @@
    19.4      n = 1;
    19.5    else
    19.6      {
    19.7 -      CHECK_INT (count);
    19.8 -      n = XINT (count);
    19.9 +      CHECK_FIXNUM (count);
   19.10 +      n = XFIXNUM (count);
   19.11      }
   19.12  
   19.13 -  /* This used to just set point to point + XINT (count), and then check
   19.14 +  /* This used to just set point to point + XFIXNUM (count), and then check
   19.15       to see if it was within boundaries.  But now that SET_PT can
   19.16       potentially do a lot of stuff (calling entering and exiting
   19.17       hooks, etcetera), that's not a good approach.  So we validate the
   19.18 @@ -109,11 +109,11 @@
   19.19         (count, buffer))
   19.20  {
   19.21    if (NILP (count))
   19.22 -    count = make_int (-1);
   19.23 +    count = make_fixnum (-1);
   19.24    else
   19.25      {
   19.26 -      CHECK_INT (count);
   19.27 -      count = make_int (- XINT (count));
   19.28 +      CHECK_FIXNUM (count);
   19.29 +      count = make_fixnum (- XFIXNUM (count));
   19.30      }
   19.31    return Fforward_char (count, buffer);
   19.32  }
   19.33 @@ -145,8 +145,8 @@
   19.34      n = 1;
   19.35    else
   19.36      {
   19.37 -      CHECK_INT (count);
   19.38 -      n = XINT (count);
   19.39 +      CHECK_FIXNUM (count);
   19.40 +      n = XFIXNUM (count);
   19.41      }
   19.42  
   19.43    negp = n <= 0;
   19.44 @@ -158,7 +158,7 @@
   19.45  	      && BUF_FETCH_CHAR (buf, pos - 1) != '\n')))
   19.46      shortage--;
   19.47    BUF_SET_PT (buf, pos);
   19.48 -  return make_int (negp ? - shortage : shortage);
   19.49 +  return make_fixnum (negp ? - shortage : shortage);
   19.50  }
   19.51  
   19.52  DEFUN ("point-at-bol", Fpoint_at_bol, 0, 2, 0, /*
   19.53 @@ -174,11 +174,11 @@
   19.54  
   19.55    buffer = wrap_buffer (b);
   19.56    if (NILP (count))
   19.57 -    count = make_int (0);
   19.58 +    count = make_fixnum (0);
   19.59    else
   19.60      {
   19.61 -      CHECK_INT (count);
   19.62 -      count = make_int (XINT (count) - 1);
   19.63 +      CHECK_FIXNUM (count);
   19.64 +      count = make_fixnum (XFIXNUM (count) - 1);
   19.65      }
   19.66  
   19.67    orig = BUF_PT (b);
   19.68 @@ -186,7 +186,7 @@
   19.69    end = BUF_PT (b);
   19.70    BUF_SET_PT (b, orig);
   19.71  
   19.72 -  return make_int (end);
   19.73 +  return make_fixnum (end);
   19.74  }
   19.75  
   19.76  DEFUN ("beginning-of-line", Fbeginning_of_line, 0, 2, "_p", /*
   19.77 @@ -204,7 +204,7 @@
   19.78  {
   19.79    struct buffer *b = decode_buffer (buffer, 1);
   19.80  
   19.81 -  BUF_SET_PT (b, XINT (Fpoint_at_bol (count, buffer)));
   19.82 +  BUF_SET_PT (b, XFIXNUM (Fpoint_at_bol (count, buffer)));
   19.83    return Qnil;
   19.84  }
   19.85  
   19.86 @@ -223,11 +223,11 @@
   19.87      n = 1;
   19.88    else
   19.89      {
   19.90 -      CHECK_INT (count);
   19.91 -      n = XINT (count);
   19.92 +      CHECK_FIXNUM (count);
   19.93 +      n = XFIXNUM (count);
   19.94      }
   19.95  
   19.96 -  return make_int (find_before_next_newline (buf, BUF_PT (buf), 0,
   19.97 +  return make_fixnum (find_before_next_newline (buf, BUF_PT (buf), 0,
   19.98  					     n - (n <= 0)));
   19.99  }
  19.100  
  19.101 @@ -246,7 +246,7 @@
  19.102  {
  19.103    struct buffer *b = decode_buffer (buffer, 1);
  19.104  
  19.105 -  BUF_SET_PT (b, XINT (Fpoint_at_eol (count, buffer)));
  19.106 +  BUF_SET_PT (b, XFIXNUM (Fpoint_at_eol (count, buffer)));
  19.107    return Qnil;
  19.108  }
  19.109  
  19.110 @@ -267,8 +267,8 @@
  19.111      n = 1;
  19.112    else
  19.113      {
  19.114 -      CHECK_INT (count);
  19.115 -      n = XINT (count);
  19.116 +      CHECK_FIXNUM (count);
  19.117 +      n = XFIXNUM (count);
  19.118      }
  19.119  
  19.120    pos = BUF_PT (buf) + n;
  19.121 @@ -311,11 +311,11 @@
  19.122      n = 1;
  19.123    else
  19.124      {
  19.125 -      CHECK_INT (count);
  19.126 -      n = XINT (count);
  19.127 +      CHECK_FIXNUM (count);
  19.128 +      n = XFIXNUM (count);
  19.129      }
  19.130  
  19.131 -  return Fdelete_char (make_int (- n), killp);
  19.132 +  return Fdelete_char (make_fixnum (- n), killp);
  19.133  }
  19.134  
  19.135  static void internal_self_insert (Ichar ch, int noautofill);
  19.136 @@ -334,8 +334,8 @@
  19.137  
  19.138    /* Can't insert more than most-positive-fixnum characters, the buffer
  19.139       won't hold that many. */
  19.140 -  check_integer_range (count, Qzero, make_int (EMACS_INT_MAX));
  19.141 -  n = XINT (count);
  19.142 +  check_integer_range (count, Qzero, make_fixnum (MOST_POSITIVE_FIXNUM));
  19.143 +  n = XFIXNUM (count);
  19.144  
  19.145    if (CHAR_OR_CHAR_INTP (Vlast_command_char))
  19.146      c = Vlast_command_char;
  19.147 @@ -396,7 +396,7 @@
  19.148  	  || (c1 != '\n' && BUF_FETCH_CHAR (buf, BUF_PT (buf)) != '\n'))
  19.149        && (EQ (overwrite, Qoverwrite_mode_binary)
  19.150            || BUF_FETCH_CHAR (buf, BUF_PT (buf)) != '\t'
  19.151 -	  || ((tab_width = XINT (buf->tab_width), tab_width <= 0)
  19.152 +	  || ((tab_width = XFIXNUM (buf->tab_width), tab_width <= 0)
  19.153  	  || tab_width > 20
  19.154  	  || !((current_column (buf) + 1) % tab_width))))
  19.155      {
  19.156 @@ -467,8 +467,8 @@
  19.157    if (!NILP (Vself_insert_face)
  19.158        && EQ (Vlast_command, Vself_insert_face_command))
  19.159      {
  19.160 -      Lisp_Object before = make_int (BUF_PT (buf) - 1);
  19.161 -      Lisp_Object after  = make_int (BUF_PT (buf));
  19.162 +      Lisp_Object before = make_fixnum (BUF_PT (buf) - 1);
  19.163 +      Lisp_Object after  = make_fixnum (BUF_PT (buf));
  19.164        Fput_text_property (before, after, Qface, Vself_insert_face, Qnil);
  19.165        Fput_text_property (before, after, Qstart_open, Qt, Qnil);
  19.166        Fput_text_property (before, after, Qend_open, Qnil, Qnil);
    20.1 --- a/src/console-gtk.c	Sat Oct 08 12:26:09 2011 +0100
    20.2 +++ b/src/console-gtk.c	Sun Oct 09 09:51:57 2011 +0100
    20.3 @@ -143,7 +143,7 @@
    20.4        char_to_associate 
    20.5  #ifdef __GDK_KEYS_H__ 
    20.6  	= Funicode_to_char
    20.7 -	      (make_int(gdk_keyval_to_unicode
    20.8 +	      (make_fixnum(gdk_keyval_to_unicode
    20.9  			(gdk_keyval_from_name(symbol_name))), Qnil);
   20.10  #else /* GTK 1.whatever doesn't. Use the X11 map. */
   20.11          = gtk_keysym_to_character(gdk_keyval_from_name(symbol_name));
    21.1 --- a/src/console-msw.c	Sat Oct 08 12:26:09 2011 +0100
    21.2 +++ b/src/console-msw.c	Sun Oct 09 09:51:57 2011 +0100
    21.3 @@ -640,7 +640,7 @@
    21.4  #undef FROB
    21.5      
    21.6      invalid_argument ("Unknown return value from MessageBox()",
    21.7 -		      make_int (retval));
    21.8 +		      make_fixnum (retval));
    21.9    }
   21.10  
   21.11    return Qnil;
    22.1 --- a/src/console-tty.c	Sat Oct 08 12:26:09 2011 +0100
    22.2 +++ b/src/console-tty.c	Sun Oct 09 09:51:57 2011 +0100
    22.3 @@ -114,7 +114,7 @@
    22.4  
    22.5    /* Determine the controlling process */
    22.6    if (!NILP (controlling_process))
    22.7 -    CHECK_INT (controlling_process);
    22.8 +    CHECK_FIXNUM (controlling_process);
    22.9  
   22.10    /* Open the specified console */
   22.11  
    23.1 --- a/src/console-x.c	Sat Oct 08 12:26:09 2011 +0100
    23.2 +++ b/src/console-x.c	Sun Oct 09 09:51:57 2011 +0100
    23.3 @@ -238,7 +238,7 @@
    23.4  
    23.5      split_up_display_spec (connection, &hostname_length, &display_length,
    23.6  			   &screen_length);
    23.7 -    hostname = Fsubseq (connection, Qzero, make_int (hostname_length));
    23.8 +    hostname = Fsubseq (connection, Qzero, make_fixnum (hostname_length));
    23.9      hostname = canonicalize_host_name (hostname);
   23.10      connection = concat2 (hostname,
   23.11  			  make_string (XSTRING_DATA (connection)
    24.1 --- a/src/console.c	Sat Oct 08 12:26:09 2011 +0100
    24.2 +++ b/src/console.c	Sun Oct 09 09:51:57 2011 +0100
    24.3 @@ -704,7 +704,7 @@
    24.4      {
    24.5        int down_we_go = 0;
    24.6  
    24.7 -      if ((XINT (Flength (Vconsole_list)) == 1)
    24.8 +      if ((XFIXNUM (Flength (Vconsole_list)) == 1)
    24.9  	  /* if we just created the console, it might not be listed,
   24.10  	     or something ... */
   24.11  	  && !NILP (memq_no_quit (console, Vconsole_list)))
   24.12 @@ -724,7 +724,7 @@
   24.13  	      stderr_out ("  Autosaving and exiting...\n");
   24.14  	      Vwindow_system = Qnil; /* let it lie! */
   24.15  	      preparing_for_armageddon = 1;
   24.16 -	      Fkill_emacs (make_int (70));
   24.17 +	      Fkill_emacs (make_fixnum (70));
   24.18  	    }
   24.19  	  else
   24.20  	    {
   24.21 @@ -1054,7 +1054,7 @@
   24.22  	}
   24.23        reset_one_console (con);
   24.24        event_stream_unselect_console (con);
   24.25 -      sys_suspend_process (XINT (Fconsole_tty_controlling_process (console)));
   24.26 +      sys_suspend_process (XFIXNUM (Fconsole_tty_controlling_process (console)));
   24.27      }
   24.28  #endif /* HAVE_TTY */
   24.29  
   24.30 @@ -1436,11 +1436,11 @@
   24.31       * #### We don't currently ever reset console variables, so there
   24.32       * is no current distinction between 0 and -1, and between -2 and -3.
   24.33       */
   24.34 -    Lisp_Object always_local_resettable = make_int (-1);
   24.35 +    Lisp_Object always_local_resettable = make_fixnum (-1);
   24.36  
   24.37  #if 0 /* not used */
   24.38 -    Lisp_Object always_local_no_default = make_int (0);
   24.39 -    Lisp_Object resettable = make_int (-3);
   24.40 +    Lisp_Object always_local_no_default = make_fixnum (0);
   24.41 +    Lisp_Object resettable = make_fixnum (-3);
   24.42  #endif
   24.43  
   24.44      /* Assign the local-flags to the slots that have default values.
   24.45 @@ -1451,7 +1451,7 @@
   24.46  
   24.47      set_lheader_implementation ((struct lrecord_header *)
   24.48  				&console_local_flags, &lrecord_console);
   24.49 -    nuke_all_console_slots (&console_local_flags, make_int (-2));
   24.50 +    nuke_all_console_slots (&console_local_flags, make_fixnum (-2));
   24.51      console_local_flags.defining_kbd_macro = always_local_resettable;
   24.52      console_local_flags.last_kbd_macro = always_local_resettable;
   24.53      console_local_flags.prefix_arg = always_local_resettable;
   24.54 @@ -1462,10 +1462,10 @@
   24.55      console_local_flags.tty_erase_char = always_local_resettable;
   24.56  #endif
   24.57  
   24.58 -    console_local_flags.function_key_map = make_int (1);
   24.59 +    console_local_flags.function_key_map = make_fixnum (1);
   24.60  
   24.61      /* #### Warning, 0x4000000 (that's six zeroes) is the largest number
   24.62 -       currently allowable due to the XINT() handling of this value.
   24.63 +       currently allowable due to the XFIXNUM() handling of this value.
   24.64         With some rearrangement you can get 4 more bits. */
   24.65    }
   24.66  }
   24.67 @@ -1607,8 +1607,8 @@
   24.68       slot of console_local_flags and vice-versa.  Must be done after all
   24.69       DEFVAR_CONSOLE_LOCAL() calls. */
   24.70  #define MARKED_SLOT(slot)						\
   24.71 -  assert ((XINT (console_local_flags.slot) != -2 &&			\
   24.72 -           XINT (console_local_flags.slot) != -3)			\
   24.73 +  assert ((XFIXNUM (console_local_flags.slot) != -2 &&			\
   24.74 +           XFIXNUM (console_local_flags.slot) != -3)			\
   24.75  	  == !(NILP (XCONSOLE (Vconsole_local_symbols)->slot)));
   24.76  #include "conslots.h"
   24.77  }
    25.1 --- a/src/data.c	Sat Oct 08 12:26:09 2011 +0100
    25.2 +++ b/src/data.c	Sun Oct 09 09:51:57 2011 +0100
    25.3 @@ -78,7 +78,7 @@
    25.4  eq_with_ebola_notice (Lisp_Object obj1, Lisp_Object obj2)
    25.5  {
    25.6    if (debug_issue_ebola_notices
    25.7 -      && ((CHARP (obj1) && INTP (obj2)) || (CHARP (obj2) && INTP (obj1))))
    25.8 +      && ((CHARP (obj1) && FIXNUMP (obj2)) || (CHARP (obj2) && FIXNUMP (obj1))))
    25.9      {
   25.10        /* #### It would be really nice if this were a proper warning
   25.11           instead of brain-dead print to Qexternal_debugging_output.  */
   25.12 @@ -321,7 +321,7 @@
   25.13         (subr))
   25.14  {
   25.15    CHECK_SUBR (subr);
   25.16 -  return make_int (XSUBR (subr)->min_args);
   25.17 +  return make_fixnum (XSUBR (subr)->min_args);
   25.18  }
   25.19  
   25.20  DEFUN ("subr-max-args", Fsubr_max_args, 1, 1, 0, /*
   25.21 @@ -336,7 +336,7 @@
   25.22    if (nargs == MANY || nargs == UNEVALLED)
   25.23      return Qnil;
   25.24    else
   25.25 -    return make_int (nargs);
   25.26 +    return make_fixnum (nargs);
   25.27  }
   25.28  
   25.29  DEFUN ("subr-interactive", Fsubr_interactive, 1, 1, 0, /*
   25.30 @@ -395,7 +395,7 @@
   25.31         (character))
   25.32  {
   25.33    CHECK_CHAR (character);
   25.34 -  return make_int (XCHAR (character));
   25.35 +  return make_fixnum (XCHAR (character));
   25.36  }
   25.37  
   25.38  DEFUN ("int-to-char", Fint_to_char, 1, 1, 0, /*
   25.39 @@ -408,7 +408,7 @@
   25.40  {
   25.41    CHECK_INTEGER (integer);
   25.42    if (CHAR_INTP (integer))
   25.43 -    return make_char (XINT (integer));
   25.44 +    return make_char (XFIXNUM (integer));
   25.45    else
   25.46      return Qnil;
   25.47  }
   25.48 @@ -452,7 +452,7 @@
   25.49  */
   25.50         (object))
   25.51  {
   25.52 -  return INTP (object) ? Qt : Qnil;
   25.53 +  return FIXNUMP (object) ? Qt : Qnil;
   25.54  }
   25.55  DEFUN ("integerp", Fintegerp, 1, 1, 0, /*
   25.56  Return t if OBJECT is an integer, nil otherwise.
   25.57 @@ -714,7 +714,7 @@
   25.58  
   25.59   retry:
   25.60  
   25.61 -  if      (INTP  (index_)) idx = XINT  (index_);
   25.62 +  if      (FIXNUMP  (index_)) idx = XFIXNUM  (index_);
   25.63    else if (CHARP (index_)) idx = XCHAR (index_); /* yuck! */
   25.64  #ifdef HAVE_BIGNUM
   25.65    else if (BIGNUMP (index_))
   25.66 @@ -746,7 +746,7 @@
   25.67      {
   25.68        if (idx >= (EMACS_INT) bit_vector_length (XBIT_VECTOR (array)))
   25.69  	goto range_error;
   25.70 -      return make_int (bit_vector_bit (XBIT_VECTOR (array), idx));
   25.71 +      return make_fixnum (bit_vector_bit (XBIT_VECTOR (array), idx));
   25.72      }
   25.73    else if (STRINGP (array))
   25.74      {
   25.75 @@ -775,7 +775,7 @@
   25.76  
   25.77   retry:
   25.78  
   25.79 -  if      (INTP  (index_)) idx = XINT (index_);
   25.80 +  if      (FIXNUMP  (index_)) idx = XFIXNUM (index_);
   25.81    else if (CHARP (index_)) idx = XCHAR (index_); /* yuck! */
   25.82  #ifdef HAVE_BIGNUM
   25.83    else if (BIGNUMP (index_))
   25.84 @@ -851,7 +851,7 @@
   25.85  {
   25.86   retry:
   25.87    p->int_p = 1;
   25.88 -  if      (INTP    (obj)) p->c.ival = XINT  (obj);
   25.89 +  if      (FIXNUMP    (obj)) p->c.ival = XFIXNUM  (obj);
   25.90    else if (CHARP   (obj)) p->c.ival = XCHAR (obj);
   25.91    else if (MARKERP (obj)) p->c.ival = marker_position (obj);
   25.92    else if (FLOATP  (obj)) p->c.dval = XFLOAT_DATA (obj), p->int_p = 0;
   25.93 @@ -866,7 +866,7 @@
   25.94  number_char_or_marker_to_double (Lisp_Object obj)
   25.95  {
   25.96   retry:
   25.97 -  if      (INTP    (obj)) return (double) XINT  (obj);
   25.98 +  if      (FIXNUMP    (obj)) return (double) XFIXNUM  (obj);
   25.99    else if (CHARP   (obj)) return (double) XCHAR (obj);
  25.100    else if (MARKERP (obj)) return (double) marker_position (obj);
  25.101    else if (FLOATP  (obj)) return XFLOAT_DATA (obj);
  25.102 @@ -882,7 +882,7 @@
  25.103  fixnum_char_or_marker_to_int (Lisp_Object obj)
  25.104  {
  25.105   retry:
  25.106 -  if      (INTP    (obj)) return XINT  (obj);
  25.107 +  if      (FIXNUMP    (obj)) return XFIXNUM  (obj);
  25.108    else if (CHARP   (obj)) return XCHAR (obj);
  25.109    else if (MARKERP (obj)) return marker_position (obj);
  25.110    else
  25.111 @@ -939,7 +939,7 @@
  25.112        switch (promote_args (&obj1, &obj2))			\
  25.113  	{							\
  25.114  	case FIXNUM_T:						\
  25.115 -	  if (!(XREALINT (obj1) c_op XREALINT (obj2)))		\
  25.116 +	  if (!(XREALFIXNUM (obj1) c_op XREALFIXNUM (obj2)))		\
  25.117  	    return Qnil;					\
  25.118  	  break;						\
  25.119  	BIGNUM_CASE (op)					\
  25.120 @@ -1069,7 +1069,7 @@
  25.121  	  switch (promote_args (&obj1, &obj2))
  25.122  	    {
  25.123  	    case FIXNUM_T:
  25.124 -	      if (XREALINT (obj1) == XREALINT (obj2))
  25.125 +	      if (XREALFIXNUM (obj1) == XREALFIXNUM (obj2))
  25.126  		return Qnil;
  25.127  	      break;
  25.128  #ifdef HAVE_BIGNUM
  25.129 @@ -1130,7 +1130,7 @@
  25.130         (number))
  25.131  {
  25.132   retry:
  25.133 -  if (INTP (number))
  25.134 +  if (FIXNUMP (number))
  25.135      return EQ (number, Qzero) ? Qt : Qnil;
  25.136  #ifdef HAVE_BIGNUM
  25.137    else if (BIGNUMP (number))
  25.138 @@ -1163,21 +1163,21 @@
  25.139  Lisp_Object
  25.140  word_to_lisp (unsigned int item)
  25.141  {
  25.142 -  return Fcons (make_int (item >> 16), make_int (item & 0xffff));
  25.143 +  return Fcons (make_fixnum (item >> 16), make_fixnum (item & 0xffff));
  25.144  }
  25.145  
  25.146  unsigned int
  25.147  lisp_to_word (Lisp_Object item)
  25.148  {
  25.149 -  if (INTP (item))
  25.150 -    return XINT (item);
  25.151 +  if (FIXNUMP (item))
  25.152 +    return XFIXNUM (item);
  25.153    else
  25.154      {
  25.155        Lisp_Object top = Fcar (item);
  25.156        Lisp_Object bot = Fcdr (item);
  25.157 -      CHECK_INT (top);
  25.158 -      CHECK_INT (bot);
  25.159 -      return (XINT (top) << 16) | (XINT (bot) & 0xffff);
  25.160 +      CHECK_FIXNUM (top);
  25.161 +      CHECK_FIXNUM (bot);
  25.162 +      return (XFIXNUM (top) << 16) | (XFIXNUM (bot) & 0xffff);
  25.163      }
  25.164  }
  25.165  
  25.166 @@ -1230,7 +1230,7 @@
  25.167    {
  25.168      Ascbyte buffer[DECIMAL_PRINT_SIZE (long)];
  25.169  
  25.170 -    long_to_string (buffer, XINT (number));
  25.171 +    long_to_string (buffer, XFIXNUM (number));
  25.172      return build_ascstring (buffer);
  25.173    }
  25.174  }
  25.175 @@ -1270,8 +1270,8 @@
  25.176      b = 10;
  25.177    else
  25.178      {
  25.179 -      check_integer_range (base, make_int (2), make_int (16));
  25.180 -      b = XINT (base);
  25.181 +      check_integer_range (base, make_fixnum (2), make_fixnum (16));
  25.182 +      b = XFIXNUM (base);
  25.183      }
  25.184  
  25.185    p = XSTRING_DATA (string);
  25.186 @@ -1379,7 +1379,7 @@
  25.187      save = *end;
  25.188      *end = '\0';
  25.189      if (*p == '\0')
  25.190 -      retval = make_int (0);
  25.191 +      retval = make_fixnum (0);
  25.192      else
  25.193        {
  25.194  	bignum_set_string (scratch_bignum, (const char *) p, b);
  25.195 @@ -1393,11 +1393,11 @@
  25.196      {
  25.197        /* Use the system-provided functions for base 10. */
  25.198  #if   SIZEOF_EMACS_INT == SIZEOF_INT
  25.199 -      return make_int (atoi ((char*) p));
  25.200 +      return make_fixnum (atoi ((char*) p));
  25.201  #elif SIZEOF_EMACS_INT == SIZEOF_LONG
  25.202 -      return make_int (atol ((char*) p));
  25.203 +      return make_fixnum (atol ((char*) p));
  25.204  #elif SIZEOF_EMACS_INT == SIZEOF_LONG_LONG
  25.205 -      return make_int (atoll ((char*) p));
  25.206 +      return make_fixnum (atoll ((char*) p));
  25.207  #endif
  25.208      }
  25.209    else
  25.210 @@ -1419,7 +1419,7 @@
  25.211  	    break;
  25.212  	  v = v * b + digit;
  25.213  	}
  25.214 -      return make_int (negative * v);
  25.215 +      return make_fixnum (negative * v);
  25.216      }
  25.217  #endif /* HAVE_BIGNUM */
  25.218  }
  25.219 @@ -1435,7 +1435,7 @@
  25.220  {
  25.221  #ifdef WITH_NUMBER_TYPES
  25.222    REGISTER int i;
  25.223 -  Lisp_Object accum = make_int (0), addend;
  25.224 +  Lisp_Object accum = make_fixnum (0), addend;
  25.225  
  25.226    for (i = 0; i < nargs; i++)
  25.227      {
  25.228 @@ -1443,7 +1443,7 @@
  25.229        switch (promote_args (&accum, &addend))
  25.230  	{
  25.231  	case FIXNUM_T:
  25.232 -	  accum = make_integer (XREALINT (accum) + XREALINT (addend));
  25.233 +	  accum = make_integer (XREALFIXNUM (accum) + XREALFIXNUM (addend));
  25.234  	  break;
  25.235  #ifdef HAVE_BIGNUM
  25.236  	case BIGNUM_T:
  25.237 @@ -1494,7 +1494,7 @@
  25.238  	}
  25.239      }
  25.240  
  25.241 -  return make_int (iaccum);
  25.242 +  return make_fixnum (iaccum);
  25.243  #endif /* WITH_NUMBER_TYPES */
  25.244  }
  25.245  
  25.246 @@ -1514,16 +1514,16 @@
  25.247    if (nargs == 1)
  25.248      {
  25.249        if (CHARP (accum))
  25.250 -	accum = make_int (XCHAR (accum));
  25.251 +	accum = make_fixnum (XCHAR (accum));
  25.252        else if (MARKERP (accum))
  25.253 -	accum = make_int (marker_position (accum));
  25.254 +	accum = make_fixnum (marker_position (accum));
  25.255  
  25.256        /* Invert the sign of accum */
  25.257        CHECK_NUMBER (accum);
  25.258        switch (get_number_type (accum))
  25.259  	{
  25.260  	case FIXNUM_T:
  25.261 -	  return make_integer (-XREALINT (accum));
  25.262 +	  return make_integer (-XREALFIXNUM (accum));
  25.263  #ifdef HAVE_BIGNUM
  25.264  	case BIGNUM_T:
  25.265  	  bignum_neg (scratch_bignum, XBIGNUM_DATA (accum));
  25.266 @@ -1553,7 +1553,7 @@
  25.267  	  switch (promote_args (&accum, &subtrahend))
  25.268  	    {
  25.269  	    case FIXNUM_T:
  25.270 -	      accum = make_integer (XREALINT (accum) - XREALINT (subtrahend));
  25.271 +	      accum = make_integer (XREALFIXNUM (accum) - XREALFIXNUM (subtrahend));
  25.272  	      break;
  25.273  #ifdef HAVE_BIGNUM
  25.274  	    case BIGNUM_T:
  25.275 @@ -1614,7 +1614,7 @@
  25.276  	}
  25.277      }
  25.278  
  25.279 -  return make_int (iaccum);
  25.280 +  return make_fixnum (iaccum);
  25.281  
  25.282   do_float:
  25.283    for (; args < args_end; args++)
  25.284 @@ -1690,7 +1690,7 @@
  25.285  	}
  25.286      }
  25.287  
  25.288 -  return make_int (iaccum);
  25.289 +  return make_fixnum (iaccum);
  25.290  #endif /* WITH_NUMBER_TYPES */
  25.291  }
  25.292  
  25.293 @@ -1711,7 +1711,7 @@
  25.294    if (nargs == 1)
  25.295      {
  25.296        i = 0;
  25.297 -      accum = make_int (1);
  25.298 +      accum = make_fixnum (1);
  25.299      }
  25.300    else
  25.301      {
  25.302 @@ -1724,9 +1724,9 @@
  25.303        switch (promote_args (&accum, &divisor))
  25.304  	{
  25.305  	case FIXNUM_T:
  25.306 -	  if (XREALINT (divisor) == 0) goto divide_by_zero;
  25.307 -	  bignum_set_long (scratch_bignum, XREALINT (accum));
  25.308 -	  bignum_set_long (scratch_bignum2, XREALINT (divisor));
  25.309 +	  if (XREALFIXNUM (divisor) == 0) goto divide_by_zero;
  25.310 +	  bignum_set_long (scratch_bignum, XREALFIXNUM (accum));
  25.311 +	  bignum_set_long (scratch_bignum2, XREALFIXNUM (divisor));
  25.312  	  accum = make_ratio_bg (scratch_bignum, scratch_bignum2);
  25.313  	  break;
  25.314  	case BIGNUM_T:
  25.315 @@ -1781,7 +1781,7 @@
  25.316    if (nargs == 1)
  25.317      {
  25.318        i = 0;
  25.319 -      accum = make_int (1);
  25.320 +      accum = make_fixnum (1);
  25.321      }
  25.322    else
  25.323      {
  25.324 @@ -1794,8 +1794,8 @@
  25.325        switch (promote_args (&accum, &divisor))
  25.326  	{
  25.327  	case FIXNUM_T:
  25.328 -	  if (XREALINT (divisor) == 0) goto divide_by_zero;
  25.329 -	  accum = make_integer (XREALINT (accum) / XREALINT (divisor));
  25.330 +	  if (XREALFIXNUM (divisor) == 0) goto divide_by_zero;
  25.331 +	  accum = make_integer (XREALFIXNUM (accum) / XREALFIXNUM (divisor));
  25.332  	  break;
  25.333  #ifdef HAVE_BIGNUM
  25.334  	case BIGNUM_T:
  25.335 @@ -1868,7 +1868,7 @@
  25.336  	}
  25.337      }
  25.338  
  25.339 -  return make_int (iaccum);
  25.340 +  return make_fixnum (iaccum);
  25.341  
  25.342   divide_floats:
  25.343    for (; args < args_end; args++)
  25.344 @@ -1902,9 +1902,9 @@
  25.345    while (!(CHARP (args[0]) || MARKERP (args[0]) || REALP (args[0])))
  25.346      args[0] = wrong_type_argument (Qnumber_char_or_marker_p, args[0]);
  25.347    if (CHARP (args[0]))
  25.348 -    args[0] = make_int (XCHAR (args[0]));
  25.349 +    args[0] = make_fixnum (XCHAR (args[0]));
  25.350    else if (MARKERP (args[0]))
  25.351 -    args[0] = make_int (marker_position (args[0]));
  25.352 +    args[0] = make_fixnum (marker_position (args[0]));
  25.353    for (i = 1; i < nargs; i++)
  25.354      {
  25.355        comp1 = args[maxindex];
  25.356 @@ -1912,7 +1912,7 @@
  25.357        switch (promote_args (&comp1, &comp2))
  25.358  	{
  25.359  	case FIXNUM_T:
  25.360 -	  if (XREALINT (comp1) < XREALINT (comp2))
  25.361 +	  if (XREALFIXNUM (comp1) < XREALFIXNUM (comp2))
  25.362  	    maxindex = i;
  25.363  	  break;
  25.364  #ifdef HAVE_BIGNUM
  25.365 @@ -1970,7 +1970,7 @@
  25.366  	}
  25.367      }
  25.368  
  25.369 -  return make_int (imax);
  25.370 +  return make_fixnum (imax);
  25.371  
  25.372   max_floats:
  25.373    while (args < args_end)
  25.374 @@ -1999,9 +1999,9 @@
  25.375    while (!(CHARP (args[0]) || MARKERP (args[0]) || REALP (args[0])))
  25.376      args[0] = wrong_type_argument (Qnumber_char_or_marker_p, args[0]);
  25.377    if (CHARP (args[0]))
  25.378 -    args[0] = make_int (XCHAR (args[0]));
  25.379 +    args[0] = make_fixnum (XCHAR (args[0]));
  25.380    else if (MARKERP (args[0]))
  25.381 -    args[0] = make_int (marker_position (args[0]));
  25.382 +    args[0] = make_fixnum (marker_position (args[0]));
  25.383    for (i = 1; i < nargs; i++)
  25.384      {
  25.385        comp1 = args[minindex];
  25.386 @@ -2009,7 +2009,7 @@
  25.387        switch (promote_args (&comp1, &comp2))
  25.388  	{
  25.389  	case FIXNUM_T:
  25.390 -	  if (XREALINT (comp1) > XREALINT (comp2))
  25.391 +	  if (XREALFIXNUM (comp1) > XREALFIXNUM (comp2))
  25.392  	    minindex = i;
  25.393  	  break;
  25.394  #ifdef HAVE_BIGNUM
  25.395 @@ -2067,7 +2067,7 @@
  25.396  	}
  25.397      }
  25.398  
  25.399 -  return make_int (imin);
  25.400 +  return make_fixnum (imin);
  25.401  
  25.402   min_floats:
  25.403    while (args < args_end)
  25.404 @@ -2092,16 +2092,16 @@
  25.405    Lisp_Object result, other;
  25.406  
  25.407    if (nargs == 0)
  25.408 -    return make_int (~0);
  25.409 +    return make_fixnum (~0);
  25.410  
  25.411    while (!(CHARP (args[0]) || MARKERP (args[0]) || INTEGERP (args[0])))
  25.412      args[0] = wrong_type_argument (Qnumber_char_or_marker_p, args[0]);
  25.413  
  25.414    result = args[0];
  25.415    if (CHARP (result))
  25.416 -    result = make_int (XCHAR (result));
  25.417 +    result = make_fixnum (XCHAR (result));
  25.418    else if (MARKERP (result))
  25.419 -    result = make_int (marker_position (result));
  25.420 +    result = make_fixnum (marker_position (result));
  25.421    for (i = 1; i < nargs; i++)
  25.422      {
  25.423        while (!(CHARP (args[i]) || MARKERP (args[i]) || INTEGERP (args[i])))
  25.424 @@ -2110,7 +2110,7 @@
  25.425        switch (promote_args (&result, &other))
  25.426  	{
  25.427  	case FIXNUM_T:
  25.428 -	  result = make_int (XREALINT (result) & XREALINT (other));
  25.429 +	  result = make_fixnum (XREALFIXNUM (result) & XREALFIXNUM (other));
  25.430  	  break;
  25.431  	case BIGNUM_T:
  25.432  	  bignum_and (scratch_bignum, XBIGNUM_DATA (result),
  25.433 @@ -2127,7 +2127,7 @@
  25.434    while (args < args_end)
  25.435      bits &= fixnum_char_or_marker_to_int (*args++);
  25.436  
  25.437 -  return make_int (bits);
  25.438 +  return make_fixnum (bits);
  25.439  #endif /* HAVE_BIGNUM */
  25.440  }
  25.441  
  25.442 @@ -2144,16 +2144,16 @@
  25.443    Lisp_Object result, other;
  25.444  
  25.445    if (nargs == 0)
  25.446 -    return make_int (0);
  25.447 +    return make_fixnum (0);
  25.448  
  25.449    while (!(CHARP (args[0]) || MARKERP (args[0]) || INTEGERP (args[0])))
  25.450      args[0] = wrong_type_argument (Qnumber_char_or_marker_p, args[0]);
  25.451  
  25.452    result = args[0];
  25.453    if (CHARP (result))
  25.454 -    result = make_int (XCHAR (result));
  25.455 +    result = make_fixnum (XCHAR (result));
  25.456    else if (MARKERP (result))
  25.457 -    result = make_int (marker_position (result));
  25.458 +    result = make_fixnum (marker_position (result));
  25.459    for (i = 1; i < nargs; i++)
  25.460      {
  25.461        while (!(CHARP (args[i]) || MARKERP (args[i]) || INTEGERP (args[i])))
  25.462 @@ -2162,7 +2162,7 @@
  25.463        switch (promote_args (&result, &other))
  25.464  	{
  25.465  	case FIXNUM_T:
  25.466 -	  result = make_int (XREALINT (result) | XREALINT (other));
  25.467 +	  result = make_fixnum (XREALFIXNUM (result) | XREALFIXNUM (other));
  25.468  	  break;
  25.469  	case BIGNUM_T:
  25.470  	  bignum_ior (scratch_bignum, XBIGNUM_DATA (result),
  25.471 @@ -2179,7 +2179,7 @@
  25.472    while (args < args_end)
  25.473      bits |= fixnum_char_or_marker_to_int (*args++);
  25.474  
  25.475 -  return make_int (bits);
  25.476 +  return make_fixnum (bits);
  25.477  #endif /* HAVE_BIGNUM */
  25.478  }
  25.479  
  25.480 @@ -2196,16 +2196,16 @@
  25.481    Lisp_Object result, other;
  25.482  
  25.483    if (nargs == 0)
  25.484 -    return make_int (0);
  25.485 +    return make_fixnum (0);
  25.486  
  25.487    while (!(CHARP (args[0]) || MARKERP (args[0]) || INTEGERP (args[0])))
  25.488      args[0] = wrong_type_argument (Qinteger_char_or_marker_p, args[0]);
  25.489  
  25.490    result = args[0];
  25.491    if (CHARP (result))
  25.492 -    result = make_int (XCHAR (result));
  25.493 +    result = make_fixnum (XCHAR (result));
  25.494    else if (MARKERP (result))
  25.495 -    result = make_int (marker_position (result));
  25.496 +    result = make_fixnum (marker_position (result));
  25.497    for (i = 1; i < nargs; i++)
  25.498      {
  25.499        while (!(CHARP (args[i]) || MARKERP (args[i]) || INTEGERP (args[i])))
  25.500 @@ -2213,7 +2213,7 @@
  25.501        other = args[i];
  25.502        if (promote_args (&result, &other) == FIXNUM_T)
  25.503  	{
  25.504 -	  result = make_int (XREALINT (result) ^ XREALINT (other));
  25.505 +	  result = make_fixnum (XREALFIXNUM (result) ^ XREALFIXNUM (other));
  25.506  	}
  25.507        else
  25.508  	{
  25.509 @@ -2230,7 +2230,7 @@
  25.510    while (args < args_end)
  25.511      bits ^= fixnum_char_or_marker_to_int (*args++);
  25.512  
  25.513 -  return make_int (bits);
  25.514 +  return make_fixnum (bits);
  25.515  #endif /* !HAVE_BIGNUM */
  25.516  }
  25.517  
  25.518 @@ -2251,7 +2251,7 @@
  25.519      }
  25.520  #endif /* HAVE_BIGNUM */
  25.521  
  25.522 -  return make_int (~ fixnum_char_or_marker_to_int (number));
  25.523 +  return make_fixnum (~ fixnum_char_or_marker_to_int (number));
  25.524  }
  25.525  
  25.526  DEFUN ("%", Frem, 2, 2, 0, /*
  25.527 @@ -2268,9 +2268,9 @@
  25.528  
  25.529    if (promote_args (&number1, &number2) == FIXNUM_T)
  25.530      {
  25.531 -      if (XREALINT (number2) == 0)
  25.532 +      if (XREALFIXNUM (number2) == 0)
  25.533  	Fsignal (Qarith_error, Qnil);
  25.534 -      return make_int (XREALINT (number1) % XREALINT (number2));
  25.535 +      return make_fixnum (XREALFIXNUM (number1) % XREALFIXNUM (number2));
  25.536      }
  25.537    else
  25.538      {
  25.539 @@ -2287,7 +2287,7 @@
  25.540    if (ival2 == 0)
  25.541      Fsignal (Qarith_error, Qnil);
  25.542  
  25.543 -  return make_int (ival1 % ival2);
  25.544 +  return make_fixnum (ival1 % ival2);
  25.545  #endif /* HAVE_BIGNUM */
  25.546  }
  25.547  
  25.548 @@ -2324,12 +2324,12 @@
  25.549      case FIXNUM_T:
  25.550        {
  25.551  	EMACS_INT ival;
  25.552 -	if (XREALINT (y) == 0) goto divide_by_zero;
  25.553 -	ival = XREALINT (x) % XREALINT (y);
  25.554 +	if (XREALFIXNUM (y) == 0) goto divide_by_zero;
  25.555 +	ival = XREALFIXNUM (x) % XREALFIXNUM (y);
  25.556  	/* If the "remainder" comes out with the wrong sign, fix it.  */
  25.557 -	if (XREALINT (y) < 0 ? ival > 0 : ival < 0)
  25.558 -	  ival += XREALINT (y);
  25.559 -	return make_int (ival);
  25.560 +	if (XREALFIXNUM (y) < 0 ? ival > 0 : ival < 0)
  25.561 +	  ival += XREALFIXNUM (y);
  25.562 +	return make_fixnum (ival);
  25.563        }
  25.564  #ifdef HAVE_BIGNUM
  25.565      case BIGNUM_T:
  25.566 @@ -2398,7 +2398,7 @@
  25.567      if (iod2.c.ival < 0 ? ival > 0 : ival < 0)
  25.568        ival += iod2.c.ival;
  25.569  
  25.570 -    return make_int (ival);
  25.571 +    return make_fixnum (ival);
  25.572    }
  25.573  #endif /* WITH_NUMBER_TYPES */
  25.574  
  25.575 @@ -2416,12 +2416,12 @@
  25.576  */
  25.577         (value, count))
  25.578  {
  25.579 -  CHECK_INT_COERCE_CHAR (value);
  25.580 -  CONCHECK_INT (count);
  25.581 -
  25.582 -  return make_int (XINT (count) > 0 ?
  25.583 -		   XINT (value) <<  XINT (count) :
  25.584 -		   XINT (value) >> -XINT (count));
  25.585 +  CHECK_FIXNUM_COERCE_CHAR (value);
  25.586 +  CONCHECK_FIXNUM (count);
  25.587 +
  25.588 +  return make_fixnum (XFIXNUM (count) > 0 ?
  25.589 +		   XFIXNUM (value) <<  XFIXNUM (count) :
  25.590 +		   XFIXNUM (value) >> -XFIXNUM (count));
  25.591  }
  25.592  
  25.593  DEFUN ("lsh", Flsh, 2, 2, 0, /*
  25.594 @@ -2438,11 +2438,11 @@
  25.595  
  25.596    if (promote_args (&value, &count) == FIXNUM_T)
  25.597      {
  25.598 -      if (XREALINT (count) <= 0)
  25.599 -	return make_int (XREALINT (value) >> -XREALINT (count));
  25.600 +      if (XREALFIXNUM (count) <= 0)
  25.601 +	return make_fixnum (XREALFIXNUM (value) >> -XREALFIXNUM (count));
  25.602        /* Use bignums to avoid overflow */
  25.603 -      bignum_set_long (scratch_bignum2, XREALINT (value));
  25.604 -      bignum_lshift (scratch_bignum, scratch_bignum2, XREALINT (count));
  25.605 +      bignum_set_long (scratch_bignum2, XREALFIXNUM (value));
  25.606 +      bignum_lshift (scratch_bignum, scratch_bignum2, XREALFIXNUM (count));
  25.607        return Fcanonicalize_number (make_bignum_bg (scratch_bignum));
  25.608      }
  25.609    else
  25.610 @@ -2465,12 +2465,12 @@
  25.611        return Fcanonicalize_number (make_bignum_bg (scratch_bignum2));
  25.612      }
  25.613  #else /* !HAVE_BIGNUM */
  25.614 -  CHECK_INT_COERCE_CHAR (value);
  25.615 -  CONCHECK_INT (count);
  25.616 -
  25.617 -  return make_int (XINT (count) > 0 ?
  25.618 -		   XUINT (value) <<  XINT (count) :
  25.619 -		   XUINT (value) >> -XINT (count));
  25.620 +  CHECK_FIXNUM_COERCE_CHAR (value);
  25.621 +  CONCHECK_FIXNUM (count);
  25.622 +
  25.623 +  return make_fixnum (XFIXNUM (count) > 0 ?
  25.624 +		   XUINT (value) <<  XFIXNUM (count) :
  25.625 +		   XUINT (value) >> -XFIXNUM (count));
  25.626  #endif /* HAVE_BIGNUM */
  25.627  }
  25.628  
  25.629 @@ -2482,7 +2482,7 @@
  25.630  {
  25.631   retry:
  25.632  
  25.633 -  if (INTP    (number)) return make_integer (XINT (number) + 1);
  25.634 +  if (FIXNUMP    (number)) return make_integer (XFIXNUM (number) + 1);
  25.635    if (CHARP   (number)) return make_integer (XCHAR (number) + 1);
  25.636    if (MARKERP (number)) return make_integer (marker_position (number) + 1);
  25.637    if (FLOATP  (number)) return make_float (XFLOAT_DATA (number) + 1.0);
  25.638 @@ -2526,7 +2526,7 @@
  25.639  {
  25.640   retry:
  25.641  
  25.642 -  if (INTP    (number)) return make_integer (XINT (number) - 1);
  25.643 +  if (FIXNUMP    (number)) return make_integer (XFIXNUM (number) - 1);
  25.644    if (CHARP   (number)) return make_integer (XCHAR (number) - 1);
  25.645    if (MARKERP (number)) return make_integer (marker_position (number) - 1);
  25.646    if (FLOATP  (number)) return make_float (XFLOAT_DATA (number) - 1.0);
  25.647 @@ -3650,12 +3650,12 @@
  25.648    DEFVAR_CONST_INT ("most-negative-fixnum", &Vmost_negative_fixnum /*
  25.649  The fixnum closest in value to negative infinity.
  25.650  */);
  25.651 -  Vmost_negative_fixnum = EMACS_INT_MIN;
  25.652 +  Vmost_negative_fixnum = MOST_NEGATIVE_FIXNUM;
  25.653  
  25.654    DEFVAR_CONST_INT ("most-positive-fixnum", &Vmost_positive_fixnum /*
  25.655  The fixnum closest in value to positive infinity.
  25.656  */);
  25.657 -  Vmost_positive_fixnum = EMACS_INT_MAX;
  25.658 +  Vmost_positive_fixnum = MOST_POSITIVE_FIXNUM;
  25.659  
  25.660  #ifdef DEBUG_XEMACS
  25.661    DEFVAR_BOOL ("debug-issue-ebola-notices", &debug_issue_ebola_notices /*
    26.1 --- a/src/database.c	Sat Oct 08 12:26:09 2011 +0100
    26.2 +++ b/src/database.c	Sun Oct 09 09:51:57 2011 +0100
    26.3 @@ -675,8 +675,8 @@
    26.4      }
    26.5    else
    26.6      {
    26.7 -      CHECK_INT (mode);
    26.8 -      modemask = XINT (mode);
    26.9 +      CHECK_FIXNUM (mode);
   26.10 +      modemask = XFIXNUM (mode);
   26.11      }
   26.12  
   26.13    if (NILP (codesys))
    27.1 --- a/src/debug.c	Sat Oct 08 12:26:09 2011 +0100
    27.2 +++ b/src/debug.c	Sun Oct 09 09:51:57 2011 +0100
    27.3 @@ -68,9 +68,9 @@
    27.4        else if (op == X_VALIDATE)					      \
    27.5  	return Qt;							      \
    27.6        else if (op == X_SETTYPE)						      \
    27.7 -        active_debug_classes.types_of_##item = XINT (type);		      \
    27.8 +        active_debug_classes.types_of_##item = XFIXNUM (type);		      \
    27.9        else if (op == X_TYPE)						      \
   27.10 -        retval = make_int (active_debug_classes.types_of_##item);	      \
   27.11 +        retval = make_fixnum (active_debug_classes.types_of_##item);	      \
   27.12        if (op == X_INIT) active_debug_classes.types_of_##item = VALBITS;	      \
   27.13      }
   27.14  
   27.15 @@ -160,7 +160,7 @@
   27.16  */
   27.17         (class_, type))
   27.18  {
   27.19 -  CHECK_INT (type);
   27.20 +  CHECK_FIXNUM (type);
   27.21    if (NILP (xemacs_debug_loop (X_VALIDATE, class_, Qnil)))
   27.22      invalid_argument ("Invalid debug class", Qunbound);
   27.23  
    28.1 --- a/src/device-gtk.c	Sat Oct 08 12:26:09 2011 +0100
    28.2 +++ b/src/device-gtk.c	Sun Oct 09 09:51:57 2011 +0100
    28.3 @@ -431,7 +431,7 @@
    28.4  */
    28.5         (device))
    28.6  {
    28.7 -   return make_int (DEVICE_GTK_DEPTH (decode_gtk_device (device)));
    28.8 +   return make_fixnum (DEVICE_GTK_DEPTH (decode_gtk_device (device)));
    28.9  }
   28.10  
   28.11  static Lisp_Object
   28.12 @@ -447,15 +447,15 @@
   28.13    switch (m)
   28.14      {
   28.15      case DM_size_device:
   28.16 -      return Fcons (make_int (gdk_screen_width ()),
   28.17 -		    make_int (gdk_screen_height ()));
   28.18 +      return Fcons (make_fixnum (gdk_screen_width ()),
   28.19 +		    make_fixnum (gdk_screen_height ()));
   28.20      case DM_size_device_mm:
   28.21 -      return Fcons (make_int (gdk_screen_width_mm ()),
   28.22 -		    make_int (gdk_screen_height_mm ()));
   28.23 +      return Fcons (make_fixnum (gdk_screen_width_mm ()),
   28.24 +		    make_fixnum (gdk_screen_height_mm ()));
   28.25      case DM_num_color_cells:
   28.26 -      return make_int (gdk_colormap_get_system_size ());
   28.27 +      return make_fixnum (gdk_colormap_get_system_size ());
   28.28      case DM_num_bit_planes:
   28.29 -      return make_int (DEVICE_GTK_DEPTH (d));
   28.30 +      return make_fixnum (DEVICE_GTK_DEPTH (d));
   28.31  
   28.32  #if 0
   28.33      case DM_color_default:
    29.1 --- a/src/device-msw.c	Sat Oct 08 12:26:09 2011 +0100
    29.2 +++ b/src/device-msw.c	Sun Oct 09 09:51:57 2011 +0100
    29.3 @@ -130,15 +130,15 @@
    29.4  static Lisp_Object
    29.5  build_sysmetrics_cons (int index1, int index2)
    29.6  {
    29.7 -  return Fcons (index1 < 0 ? Qnil : make_int (GetSystemMetrics (index1)),
    29.8 -		index2 < 0 ? Qnil : make_int (GetSystemMetrics (index2)));
    29.9 +  return Fcons (index1 < 0 ? Qnil : make_fixnum (GetSystemMetrics (index1)),
   29.10 +		index2 < 0 ? Qnil : make_fixnum (GetSystemMetrics (index2)));
   29.11  }
   29.12  
   29.13  static Lisp_Object
   29.14  build_devicecaps_cons (HDC hdc, int index1, int index2)
   29.15  {
   29.16 -  return Fcons (index1 < 0 ? Qnil : make_int (GetDeviceCaps (hdc, index1)),
   29.17 -		index2 < 0 ? Qnil : make_int (GetDeviceCaps (hdc, index2)));
   29.18 +  return Fcons (index1 < 0 ? Qnil : make_fixnum (GetDeviceCaps (hdc, index1)),
   29.19 +		index2 < 0 ? Qnil : make_fixnum (GetDeviceCaps (hdc, index2)));
   29.20  }
   29.21  
   29.22  
   29.23 @@ -323,27 +323,27 @@
   29.24    switch (m)
   29.25      {
   29.26      case DM_size_device:
   29.27 -      return Fcons (make_int (GetDeviceCaps (hdc, HORZRES)),
   29.28 -		    make_int (GetDeviceCaps (hdc, VERTRES)));
   29.29 +      return Fcons (make_fixnum (GetDeviceCaps (hdc, HORZRES)),
   29.30 +		    make_fixnum (GetDeviceCaps (hdc, VERTRES)));
   29.31        break;
   29.32      case DM_device_dpi:
   29.33 -      return Fcons (make_int (GetDeviceCaps (hdc, LOGPIXELSX)),
   29.34 -		    make_int (GetDeviceCaps (hdc, LOGPIXELSY)));
   29.35 +      return Fcons (make_fixnum (GetDeviceCaps (hdc, LOGPIXELSX)),
   29.36 +		    make_fixnum (GetDeviceCaps (hdc, LOGPIXELSY)));
   29.37        break;
   29.38      case DM_size_device_mm:
   29.39 -      return Fcons (make_int (GetDeviceCaps (hdc, HORZSIZE)),
   29.40 -		    make_int (GetDeviceCaps (hdc, VERTSIZE)));
   29.41 +      return Fcons (make_fixnum (GetDeviceCaps (hdc, HORZSIZE)),
   29.42 +		    make_fixnum (GetDeviceCaps (hdc, VERTSIZE)));
   29.43        break;
   29.44      case DM_num_bit_planes:
   29.45        /* this is what X means by bitplanes therefore we ought to be
   29.46           consistent. num planes is always 1 under mswindows and
   29.47           therefore useless */
   29.48 -      return make_int (GetDeviceCaps (hdc, BITSPIXEL));
   29.49 +      return make_fixnum (GetDeviceCaps (hdc, BITSPIXEL));
   29.50        break;
   29.51      case DM_num_color_cells:
   29.52        /* #### SIZEPALETTE only valid if RC_PALETTE bit set in RASTERCAPS,
   29.53           what should we return for a non-palette-based device? */
   29.54 -      return make_int (GetDeviceCaps (hdc, SIZEPALETTE));
   29.55 +      return make_fixnum (GetDeviceCaps (hdc, SIZEPALETTE));
   29.56        break;
   29.57  
   29.58        /*** Colors ***/
   29.59 @@ -383,15 +383,15 @@
   29.60        {
   29.61  	RECT rc;
   29.62  	mswindows_get_workspace_coords (&rc);
   29.63 -	return Fcons (make_int (rc.right - rc.left),
   29.64 -		      make_int (rc.bottom - rc.top));
   29.65 +	return Fcons (make_fixnum (rc.right - rc.left),
   29.66 +		      make_fixnum (rc.bottom - rc.top));
   29.67        }
   29.68  
   29.69      case DM_offset_workspace:
   29.70        {
   29.71  	RECT rc;
   29.72  	mswindows_get_workspace_coords (&rc);
   29.73 -	return Fcons (make_int (rc.left), make_int (rc.top));
   29.74 +	return Fcons (make_fixnum (rc.left), make_fixnum (rc.top));
   29.75        }
   29.76  
   29.77        /*
   29.78 @@ -403,7 +403,7 @@
   29.79        /*** Features ***/
   29.80  #define FROB(met, index)			\
   29.81      case DM_##met:				\
   29.82 -      return make_int (GetSystemMetrics (index));
   29.83 +      return make_fixnum (GetSystemMetrics (index));
   29.84  
   29.85        FROB (mouse_buttons, SM_CMOUSEBUTTONS);
   29.86        FROB (swap_buttons, SM_SWAPBUTTON);
   29.87 @@ -600,7 +600,7 @@
   29.88        /* this is what X means by bitplanes therefore we ought to be
   29.89           consistent. num planes is always 1 under mswindows and
   29.90           therefore useless */
   29.91 -      return make_int (GetDeviceCaps (DEVICE_MSPRINTER_HDC (d), BITSPIXEL));
   29.92 +      return make_fixnum (GetDeviceCaps (DEVICE_MSPRINTER_HDC (d), BITSPIXEL));
   29.93  
   29.94      case DM_num_color_cells:	/* Printers are non-palette devices */
   29.95      case DM_slow_device:	/* Animation would be a really bad idea */
   29.96 @@ -794,13 +794,13 @@
   29.97  
   29.98      /* Do consing in reverse order.
   29.99         Number of copies */
  29.100 -    result = Fcons (Qcopies, Fcons (make_int (pd.nCopies), result));
  29.101 +    result = Fcons (Qcopies, Fcons (make_fixnum (pd.nCopies), result));
  29.102  
  29.103      /* Page range */
  29.104      if (pd.Flags & PD_PAGENUMS)
  29.105        {
  29.106 -	result = Fcons (Qto_page, Fcons (make_int (pd.nToPage), result));
  29.107 -	result = Fcons (Qfrom_page, Fcons (make_int (pd.nFromPage), result));
  29.108 +	result = Fcons (Qto_page, Fcons (make_fixnum (pd.nToPage), result));
  29.109 +	result = Fcons (Qfrom_page, Fcons (make_fixnum (pd.nFromPage), result));
  29.110  	result = Fcons (Qselected_page_button, Fcons (Qpages, result));
  29.111        }
  29.112      else if (pd.Flags & PD_SELECTION)
  29.113 @@ -883,17 +883,17 @@
  29.114  plist_get_margin (Lisp_Object plist, Lisp_Object prop, int mm_p)
  29.115  {
  29.116    Lisp_Object val =
  29.117 -    Fplist_get (plist, prop, make_int (mswindows_get_default_margin (prop)));
  29.118 -  if (!INTP (val))
  29.119 +    Fplist_get (plist, prop, make_fixnum (mswindows_get_default_margin (prop)));
  29.120 +  if (!FIXNUMP (val))
  29.121      invalid_argument ("Margin value must be an integer", val);
  29.122  
  29.123 -  return MulDiv (XINT (val), mm_p ? 254 : 100, 144);
  29.124 +  return MulDiv (XFIXNUM (val), mm_p ? 254 : 100, 144);
  29.125  }
  29.126  
  29.127  static Lisp_Object
  29.128  plist_set_margin (Lisp_Object plist, Lisp_Object prop, int margin, int mm_p)
  29.129  {
  29.130 -  Lisp_Object val = make_int (MulDiv (margin, 144, mm_p ? 254 : 100));
  29.131 +  Lisp_Object val = make_fixnum (MulDiv (margin, 144, mm_p ? 254 : 100));
  29.132    return Fcons (prop, Fcons (val, plist));
  29.133  }
  29.134  
  29.135 @@ -1279,7 +1279,7 @@
  29.136  static void
  29.137  signal_enum_printer_error (void)
  29.138  {
  29.139 -  invalid_operation ("Error enumerating printers", make_int (GetLastError ()));
  29.140 +  invalid_operation ("Error enumerating printers", make_fixnum (GetLastError ()));
  29.141  }
  29.142  
  29.143  DEFUN ("mswindows-printer-list", Fmswindows_printer_list, 0, 0, 0, /*
    30.1 --- a/src/device-tty.c	Sat Oct 08 12:26:09 2011 +0100
    30.2 +++ b/src/device-tty.c	Sun Oct 09 09:51:57 2011 +0100
    30.3 @@ -192,16 +192,16 @@
    30.4    switch (m)
    30.5      {
    30.6      case DM_size_device:
    30.7 -      return Fcons (make_int (CONSOLE_TTY_DATA (con)->width),
    30.8 -		    make_int (CONSOLE_TTY_DATA (con)->height));
    30.9 +      return Fcons (make_fixnum (CONSOLE_TTY_DATA (con)->width),
   30.10 +		    make_fixnum (CONSOLE_TTY_DATA (con)->height));
   30.11      case DM_num_bit_planes:
   30.12        {
   30.13          EMACS_INT l2 = (EMACS_INT)  (log (CONSOLE_TTY_DATA (con)->colors)
   30.14                                       / log (2));
   30.15 -        return make_int (l2);
   30.16 +        return make_fixnum (l2);
   30.17        }
   30.18      case DM_num_color_cells:
   30.19 -      return make_int (CONSOLE_TTY_DATA (con)->colors);
   30.20 +      return make_fixnum (CONSOLE_TTY_DATA (con)->colors);
   30.21      default: /* No such device metric property for TTY devices */
   30.22        return Qunbound;
   30.23      }
    31.1 --- a/src/device-x.c	Sat Oct 08 12:26:09 2011 +0100
    31.2 +++ b/src/device-x.c	Sun Oct 09 09:51:57 2011 +0100
    31.3 @@ -1617,10 +1617,10 @@
    31.4        else if (EQ (type, Qnatnum) && i < 0)
    31.5  	return maybe_signal_continuable_error_2
    31.6  	  (Qinvalid_argument, "Invalid numerical value for resource",
    31.7 -	   make_int (i), build_extstring (name_string, Qbinary),
    31.8 +	   make_fixnum (i), build_extstring (name_string, Qbinary),
    31.9  	   Qresource, errb);
   31.10        else
   31.11 -	return make_int (i);
   31.12 +	return make_fixnum (i);
   31.13      }
   31.14    else
   31.15      {
   31.16 @@ -1735,7 +1735,7 @@
   31.17  */
   31.18         (device))
   31.19  {
   31.20 -   return make_int (DEVICE_X_DEPTH (decode_x_device (device)));
   31.21 +   return make_fixnum (DEVICE_X_DEPTH (decode_x_device (device)));
   31.22  }
   31.23  
   31.24  static Lisp_Object
   31.25 @@ -1747,17 +1747,17 @@
   31.26    switch (m)
   31.27      {
   31.28      case DM_size_device:
   31.29 -      return Fcons (make_int (DisplayWidth (dpy, DefaultScreen (dpy))),
   31.30 -		    make_int (DisplayHeight (dpy, DefaultScreen (dpy))));
   31.31 +      return Fcons (make_fixnum (DisplayWidth (dpy, DefaultScreen (dpy))),
   31.32 +		    make_fixnum (DisplayHeight (dpy, DefaultScreen (dpy))));
   31.33      case DM_size_device_mm:
   31.34 -      return Fcons (make_int (DisplayWidthMM (dpy, DefaultScreen (dpy))),
   31.35 -		    make_int (DisplayHeightMM (dpy, DefaultScreen (dpy))));
   31.36 +      return Fcons (make_fixnum (DisplayWidthMM (dpy, DefaultScreen (dpy))),
   31.37 +		    make_fixnum (DisplayHeightMM (dpy, DefaultScreen (dpy))));
   31.38      case DM_num_bit_planes:
   31.39 -      return make_int (DisplayPlanes (dpy, DefaultScreen (dpy)));
   31.40 +      return make_fixnum (DisplayPlanes (dpy, DefaultScreen (dpy)));
   31.41      case DM_num_color_cells:
   31.42 -      return make_int (DisplayCells (dpy, DefaultScreen (dpy)));
   31.43 +      return make_fixnum (DisplayCells (dpy, DefaultScreen (dpy)));
   31.44      case DM_num_screens:
   31.45 -      return make_int (ScreenCount (dpy));
   31.46 +      return make_fixnum (ScreenCount (dpy));
   31.47      case DM_backing_store:
   31.48        switch (DoesBackingStore (DefaultScreenOfDisplay (dpy)))
   31.49  	{
   31.50 @@ -1798,9 +1798,9 @@
   31.51  {
   31.52    Display *dpy = get_x_display (device);
   31.53  
   31.54 -  return list3 (make_int (ProtocolVersion  (dpy)),
   31.55 -		make_int (ProtocolRevision (dpy)),
   31.56 -		make_int (VendorRelease    (dpy)));
   31.57 +  return list3 (make_fixnum (ProtocolVersion  (dpy)),
   31.58 +		make_fixnum (ProtocolRevision (dpy)),
   31.59 +		make_fixnum (VendorRelease    (dpy)));
   31.60  }
   31.61  
   31.62  DEFUN ("x-valid-keysym-name-p", Fx_valid_keysym_name_p, 1, 1, 0, /*
    32.1 --- a/src/device.c	Sat Oct 08 12:26:09 2011 +0100
    32.2 +++ b/src/device.c	Sun Oct 09 09:51:57 2011 +0100
    32.3 @@ -805,7 +805,7 @@
    32.4        int delete_console = 0;
    32.5        /* If we're deleting the only device on the console,
    32.6  	 delete the console. */
    32.7 -      if ((XINT (Flength (CONSOLE_DEVICE_LIST (c))) == 1)
    32.8 +      if ((XFIXNUM (Flength (CONSOLE_DEVICE_LIST (c))) == 1)
    32.9  	  /* if we just created the device, it might not be listed,
   32.10  	     or something ... */
   32.11  	  && !NILP (memq_no_quit (device, CONSOLE_DEVICE_LIST (c))))
   32.12 @@ -1031,9 +1031,9 @@
   32.13  */
   32.14         (device, rate))
   32.15  {
   32.16 -  CHECK_INT (rate);
   32.17 +  CHECK_FIXNUM (rate);
   32.18  
   32.19 -  DEVICE_BAUD_RATE (decode_device (device)) = XINT (rate);
   32.20 +  DEVICE_BAUD_RATE (decode_device (device)) = XFIXNUM (rate);
   32.21  
   32.22    return rate;
   32.23  }
   32.24 @@ -1043,7 +1043,7 @@
   32.25  */
   32.26         (device))
   32.27  {
   32.28 -  return make_int (DEVICE_BAUD_RATE (decode_device (device)));
   32.29 +  return make_fixnum (DEVICE_BAUD_RATE (decode_device (device)));
   32.30  }
   32.31  
   32.32  DEFUN ("device-printer-p", Fdevice_printer_p, 0, 1, 0, /*
    33.1 --- a/src/dialog-msw.c	Sat Oct 08 12:26:09 2011 +0100
    33.2 +++ b/src/dialog-msw.c	Sun Oct 09 09:51:57 2011 +0100
    33.3 @@ -447,7 +447,7 @@
    33.4    else
    33.5      signal_error (Qdialog_box_error,
    33.6  		  "Unable to create folder browser",
    33.7 -		  make_int (0));
    33.8 +		  make_fixnum (0));
    33.9    return ret;
   33.10  }
   33.11  
   33.12 @@ -523,7 +523,7 @@
   33.13  	  
   33.14  	  signal_error (Qdialog_box_error,
   33.15  			"Unknown common dialog box error???",
   33.16 -			make_int (err));
   33.17 +			make_fixnum (err));
   33.18  	}
   33.19      }
   33.20    
    34.1 --- a/src/dialog-x.c	Sat Oct 08 12:26:09 2011 +0100
    34.2 +++ b/src/dialog-x.c	Sun Oct 09 09:51:57 2011 +0100
    34.3 @@ -94,7 +94,7 @@
    34.4    popup_selection_callback (widget, id, client_data);
    34.5    /* #### need to error-protect!  will do so when i merge in
    34.6       my working ws */
    34.7 -  va_run_hook_with_args (Qdelete_dialog_box_hook, 1, make_int (id));
    34.8 +  va_run_hook_with_args (Qdelete_dialog_box_hook, 1, make_fixnum (id));
    34.9    lw_destroy_all_widgets (id);
   34.10  
   34.11    /* The Motif dialog box sets the keyboard focus to itself.  When it
   34.12 @@ -289,7 +289,7 @@
   34.13  
   34.14    /* #### this could (theoretically) cause problems if we are up for
   34.15       a REALLY REALLY long time -- too big to fit into lisp integer. */
   34.16 -  return make_int (dbox_id);
   34.17 +  return make_fixnum (dbox_id);
   34.18  }
   34.19  
   34.20  void
    35.1 --- a/src/dired.c	Sat Oct 08 12:26:09 2011 +0100
    35.2 +++ b/src/dired.c	Sun Oct 09 09:51:57 2011 +0100
    35.3 @@ -507,7 +507,7 @@
    35.4      return bestmatch;
    35.5    if (matchcount == 1 && bestmatchsize == file_name_length)
    35.6      return Qt;
    35.7 -  return Fsubseq (bestmatch, Qzero, make_int (bestmatchsize));
    35.8 +  return Fsubseq (bestmatch, Qzero, make_fixnum (bestmatchsize));
    35.9  }
   35.10  
   35.11  
   35.12 @@ -669,7 +669,7 @@
   35.13  	      if (status_status_statui_statum_statu != NERR_Success &&
   35.14  		  status_status_statui_statum_statu != ERROR_MORE_DATA)
   35.15  		invalid_operation ("Error enumerating users",
   35.16 -				   make_int (GetLastError ()));
   35.17 +				   make_fixnum (GetLastError ()));
   35.18  	      for (i = 0; i < (int) entriesread; i++)
   35.19  		{
   35.20  		  DO_REALLOC (user_cache.user_names, user_cache.size,
   35.21 @@ -771,7 +771,7 @@
   35.22      return bestmatch;
   35.23    if (matchcount == 1 && bestmatchsize == user_name_length)
   35.24      return Qt;
   35.25 -  return Fsubseq (bestmatch, Qzero, make_int (bestmatchsize));
   35.26 +  return Fsubseq (bestmatch, Qzero, make_fixnum (bestmatchsize));
   35.27  }
   35.28  
   35.29  
   35.30 @@ -903,7 +903,7 @@
   35.31      }
   35.32  
   35.33  #ifndef HAVE_BIGNUM
   35.34 -  size = make_integer (NUMBER_FITS_IN_AN_EMACS_INT (s.st_size) ?
   35.35 +  size = make_integer (NUMBER_FITS_IN_A_FIXNUM (s.st_size) ?
   35.36  		       (EMACS_INT)s.st_size : -1);
   35.37  #else
   35.38    size = make_integer (s.st_size);
   35.39 @@ -927,17 +927,17 @@
   35.40  
   35.41    RETURN_UNGCPRO (listn (12,
   35.42  			 mode,
   35.43 -			 make_int (s.st_nlink),
   35.44 -			 make_int (s.st_uid),
   35.45 -			 make_int (s.st_gid),
   35.46 +			 make_fixnum (s.st_nlink),
   35.47 +			 make_fixnum (s.st_uid),
   35.48 +			 make_fixnum (s.st_gid),
   35.49  			 make_time (s.st_atime),
   35.50  			 make_time (s.st_mtime),
   35.51  			 make_time (s.st_ctime),
   35.52  			 size,
   35.53  			 modestring,
   35.54  			 gid,
   35.55 -			 make_int (s.st_ino),
   35.56 -			 make_int (s.st_dev)));
   35.57 +			 make_fixnum (s.st_ino),
   35.58 +			 make_fixnum (s.st_dev)));
   35.59  }
   35.60  
   35.61  
    36.1 --- a/src/doc.c	Sat Oct 08 12:26:09 2011 +0100
    36.2 +++ b/src/doc.c	Sun Oct 09 09:51:57 2011 +0100
    36.3 @@ -66,7 +66,7 @@
    36.4  	name_reloc = build_istring (name_nonreloc);
    36.5        return_me = list3 (build_msg_string
    36.6  			 ("Position out of range in doc string file"),
    36.7 -			  name_reloc, make_int (position));
    36.8 +			  name_reloc, make_fixnum (position));
    36.9        goto done;
   36.10      }
   36.11  
   36.12 @@ -181,7 +181,7 @@
   36.13  	name_reloc = build_istring (name_nonreloc);
   36.14        return_me = list3 (build_msg_string
   36.15  			 ("Position out of range in doc string file"),
   36.16 -			  name_reloc, make_int (position));
   36.17 +			  name_reloc, make_fixnum (position));
   36.18        goto done;
   36.19      }
   36.20  
   36.21 @@ -271,7 +271,7 @@
   36.22              default:
   36.23                return_me = list2 (build_msg_string
   36.24  	("Invalid data in documentation file -- ^A followed by weird code"),
   36.25 -                                 make_int (c));
   36.26 +                                 make_fixnum (c));
   36.27                goto done;
   36.28              }
   36.29  	}
   36.30 @@ -317,16 +317,16 @@
   36.31    Lisp_Object name_reloc = Qnil;
   36.32    int standard_doc_file = 0;
   36.33  
   36.34 -  if (INTP (filepos))
   36.35 +  if (FIXNUMP (filepos))
   36.36      {
   36.37        file = Vinternal_doc_file_name;
   36.38        standard_doc_file = 1;
   36.39 -      position = XINT (filepos);
   36.40 +      position = XFIXNUM (filepos);
   36.41      }
   36.42 -  else if (CONSP (filepos) && INTP (XCDR (filepos)))
   36.43 +  else if (CONSP (filepos) && FIXNUMP (XCDR (filepos)))
   36.44      {
   36.45        file = XCAR (filepos);
   36.46 -      position = XINT (XCDR (filepos));
   36.47 +      position = XFIXNUM (XCDR (filepos));
   36.48        if (position < 0)
   36.49  	position = - position;
   36.50      }
   36.51 @@ -414,16 +414,16 @@
   36.52    Lisp_Object name_reloc = Qnil;
   36.53    int standard_doc_file = 0;
   36.54  
   36.55 -  if (INTP (filepos))
   36.56 +  if (FIXNUMP (filepos))
   36.57      {
   36.58        file = Vinternal_doc_file_name;
   36.59        standard_doc_file = 1;
   36.60 -      position = XINT (filepos);
   36.61 +      position = XFIXNUM (filepos);
   36.62      }
   36.63 -  else if (CONSP (filepos) && INTP (XCDR (filepos)))
   36.64 +  else if (CONSP (filepos) && FIXNUMP (XCDR (filepos)))
   36.65      {
   36.66        file = XCAR (filepos);
   36.67 -      position = XINT (XCDR (filepos));
   36.68 +      position = XFIXNUM (XCDR (filepos));
   36.69        if (position < 0)
   36.70  	position = - position;
   36.71      }
   36.72 @@ -532,7 +532,7 @@
   36.73  	  else
   36.74  	    {
   36.75  	      filename = get_object_file_name 
   36.76 -		(make_int (- (EMACS_INT) XSUBR (fun)->doc));
   36.77 +		(make_fixnum (- (EMACS_INT) XSUBR (fun)->doc));
   36.78  	      return filename;
   36.79  	    }
   36.80  	}
   36.81 @@ -562,11 +562,11 @@
   36.82  
   36.83        if (!NILP(doc_offset)) 
   36.84  	{
   36.85 -	  if (INTP(doc_offset))
   36.86 +	  if (FIXNUMP(doc_offset))
   36.87  	    {
   36.88  	      filename = get_object_file_name 
   36.89 -		(XINT (doc_offset) > 0 ? doc_offset
   36.90 -		 : make_int (- XINT (doc_offset)));
   36.91 +		(XFIXNUM (doc_offset) > 0 ? doc_offset
   36.92 +		 : make_fixnum (- XFIXNUM (doc_offset)));
   36.93  	    }
   36.94  	  else if (CONSP(doc_offset))
   36.95  	    {
   36.96 @@ -599,7 +599,7 @@
   36.97        if ((EMACS_INT) XSUBR (fun)->doc >= 0)
   36.98  	doc = build_cistring (XSUBR (fun)->doc);
   36.99        else
  36.100 -        doc = get_doc_string (make_int (- (EMACS_INT) XSUBR (fun)->doc));
  36.101 +        doc = get_doc_string (make_fixnum (- (EMACS_INT) XSUBR (fun)->doc));
  36.102      }
  36.103    else if (COMPILED_FUNCTIONP (fun))
  36.104      {
  36.105 @@ -699,8 +699,8 @@
  36.106    GCPRO1 (doc);
  36.107  
  36.108    doc = Fget (symbol, prop, Qnil);
  36.109 -  if (INTP (doc))
  36.110 -    doc = get_doc_string (XINT (doc) > 0 ? doc : make_int (- XINT (doc)));
  36.111 +  if (FIXNUMP (doc))
  36.112 +    doc = get_doc_string (XFIXNUM (doc) > 0 ? doc : make_fixnum (- XFIXNUM (doc)));
  36.113    else if (CONSP (doc))
  36.114      doc = get_doc_string (doc);
  36.115  #ifdef I18N3
  36.116 @@ -786,7 +786,7 @@
  36.117  	  sym = oblookup (Vobarray, p + 2, end - p - 2);
  36.118  	  if (SYMBOLP (sym))
  36.119  	    {
  36.120 -              Lisp_Object offset = make_int (pos + end + 1 - buf);
  36.121 +              Lisp_Object offset = make_fixnum (pos + end + 1 - buf);
  36.122  	      /* Attach a docstring to a variable */
  36.123  	      if (p[1] == 'V')
  36.124  		{
  36.125 @@ -801,12 +801,12 @@
  36.126  		      /* In the case of duplicate doc file entries, always
  36.127  			 take the later one.  But if the doc is not an int
  36.128  			 (a string, say) leave it alone. */
  36.129 -		      if (!INTP (old))
  36.130 +		      if (!FIXNUMP (old))
  36.131  			goto weird;
  36.132  		    }
  36.133  		  Fput (sym, Qvariable_documentation,
  36.134                          ((end[1] == '*')
  36.135 -                         ? make_int (- XINT (offset))
  36.136 +                         ? make_fixnum (- XFIXNUM (offset))
  36.137                           : offset));
  36.138  		}
  36.139  	      /* Attach a docstring to a function.
  36.140 @@ -851,7 +851,7 @@
  36.141  				     "subr", pos);
  36.142  			  goto weird;
  36.143  			}
  36.144 -		      XSUBR (fun)->doc = (char *) (- XINT (offset));
  36.145 +		      XSUBR (fun)->doc = (char *) (- XFIXNUM (offset));
  36.146  		    }
  36.147  		  else if (CONSP (fun))
  36.148  		    {
  36.149 @@ -861,7 +861,7 @@
  36.150  			{
  36.151  			  tem = Fcdr (Fcdr (fun));
  36.152  			  if (CONSP (tem) &&
  36.153 -			      INTP (XCAR (tem)))
  36.154 +			      FIXNUMP (XCAR (tem)))
  36.155  			    {
  36.156  			      Lisp_Object old = XCAR (tem);
  36.157  			      if (!ZEROP (old))
  36.158 @@ -876,7 +876,7 @@
  36.159  				     always take the later one.  But if the doc
  36.160  				     is not an int (a string, say) leave it
  36.161  				     alone. */
  36.162 -				  if (!INTP (old))
  36.163 +				  if (!FIXNUMP (old))
  36.164  				    goto weird;
  36.165  				}
  36.166  			      XCAR (tem) = offset;
  36.167 @@ -890,7 +890,7 @@
  36.168  			    {
  36.169  			      /* DOC string is a string not integer 0 */
  36.170  #if 0
  36.171 -			      weird_doc (sym, "!INTP(XCAR(tem))",
  36.172 +			      weird_doc (sym, "!FIXNUMP(XCAR(tem))",
  36.173  					 "function", pos);
  36.174  #endif
  36.175  			      goto cont;
  36.176 @@ -920,7 +920,7 @@
  36.177                            /* In the case of duplicate doc file entries,
  36.178                               always take the later one.  But if the doc is
  36.179                               not an int (a string, say) leave it alone. */
  36.180 -                          if (!INTP (old))
  36.181 +                          if (!FIXNUMP (old))
  36.182                              goto weird;
  36.183                          }
  36.184  
  36.185 @@ -940,7 +940,7 @@
  36.186                  {
  36.187                  /* lose: */
  36.188                    signal_error (Qfile_error, "DOC file invalid at position",
  36.189 -				make_int (pos));
  36.190 +				make_fixnum (pos));
  36.191                  weird:
  36.192                    /* goto lose */;
  36.193                  }
  36.194 @@ -999,8 +999,8 @@
  36.195  	      doc = -1;
  36.196  	      tem = Fcdr (Fcdr (fun));
  36.197  	      if (CONSP (tem) &&
  36.198 -		  INTP (XCAR (tem)))
  36.199 -		doc = XINT (XCAR (tem));
  36.200 +		  FIXNUMP (XCAR (tem)))
  36.201 +		doc = XFIXNUM (XCAR (tem));
  36.202  	    }
  36.203  	}
  36.204        else if (COMPILED_FUNCTIONP (fun))
  36.205 @@ -1011,8 +1011,8 @@
  36.206            else
  36.207              {
  36.208                Lisp_Object tem = compiled_function_documentation (f);
  36.209 -              if (INTP (tem))
  36.210 -                doc = XINT (tem);
  36.211 +              if (FIXNUMP (tem))
  36.212 +                doc = XFIXNUM (tem);
  36.213              }
  36.214  	}
  36.215  
    37.1 --- a/src/doprnt.c	Sat Oct 08 12:26:09 2011 +0100
    37.2 +++ b/src/doprnt.c	Sun Oct 09 09:51:57 2011 +0100
    37.3 @@ -371,7 +371,7 @@
    37.4  	}
    37.5  
    37.6        if (j == Dynarr_length (specs))
    37.7 -	syntax_error ("No conversion spec for argument", make_int (i));
    37.8 +	syntax_error ("No conversion spec for argument", make_fixnum (i));
    37.9  
   37.10        ch = spec->converter;
   37.11  
   37.12 @@ -453,7 +453,7 @@
   37.13        if (nargs < get_args_needed (specs))
   37.14  	signal_error_1 (Qwrong_number_of_arguments,
   37.15  			list3 (Qformat,
   37.16 -			       make_int (nargs),
   37.17 +			       make_fixnum (nargs),
   37.18  			       !NILP (format_reloc) ? format_reloc :
   37.19  			       make_string (format_nonreloc, format_length)));
   37.20      }
   37.21 @@ -494,17 +494,17 @@
   37.22  	  struct printf_spec *nextspec = Dynarr_atp (specs, i + 1);
   37.23  	  Lisp_Object obj = largs[spec->argnum - 1];
   37.24  
   37.25 -	  if (INTP (obj))
   37.26 +	  if (FIXNUMP (obj))
   37.27  	    {
   37.28  	      if (spec->forwarding_precision)
   37.29  		{
   37.30 -		  nextspec->precision = XINT (obj);
   37.31 +		  nextspec->precision = XFIXNUM (obj);
   37.32  		  nextspec->minwidth = spec->minwidth;
   37.33  		}
   37.34  	      else
   37.35  		{
   37.36 -		  nextspec->minwidth = XINT (obj);
   37.37 -		  if (XINT (obj) < 0)
   37.38 +		  nextspec->minwidth = XFIXNUM (obj);
   37.39 +		  if (XFIXNUM (obj) < 0)
   37.40  		    {
   37.41  		      spec->minus_flag = 1;
   37.42  		      nextspec->minwidth = - nextspec->minwidth;
   37.43 @@ -521,7 +521,7 @@
   37.44  
   37.45        if (largs && (spec->argnum < 1 || spec->argnum > nargs))
   37.46  	syntax_error ("Invalid repositioning argument",
   37.47 -		      make_int (spec->argnum));
   37.48 +		      make_fixnum (spec->argnum));
   37.49  
   37.50        else if (ch == 'S' || ch == 's')
   37.51  	{
   37.52 @@ -588,7 +588,7 @@
   37.53  	    {
   37.54  	      Lisp_Object obj = largs[spec->argnum - 1];
   37.55  	      if (CHARP (obj))
   37.56 -		obj = make_int (XCHAR (obj));
   37.57 +		obj = make_fixnum (XCHAR (obj));
   37.58  	      if (!NUMBERP (obj))
   37.59  		{
   37.60  		  /* WARNING!  This MUST be big enough for the sprintf below */
   37.61 @@ -600,8 +600,8 @@
   37.62  		}
   37.63  	      else if (strchr (double_converters, ch))
   37.64  		{
   37.65 -		  if (INTP (obj))
   37.66 -		    arg.d = XINT (obj);
   37.67 +		  if (FIXNUMP (obj))
   37.68 +		    arg.d = XFIXNUM (obj);
   37.69  		  else if (FLOATP (obj))
   37.70  		    arg.d = XFLOAT_DATA (obj);
   37.71  #ifdef HAVE_BIGNUM
   37.72 @@ -643,7 +643,7 @@
   37.73  		      obj =
   37.74  			Fcanonicalize_number (make_bignum_bg (scratch_bignum));
   37.75  #else /* !HAVE_BIGNUM */
   37.76 -		      obj = make_int (bigfloat_to_long (XBIGFLOAT_DATA (obj)));
   37.77 +		      obj = make_fixnum (bigfloat_to_long (XBIGFLOAT_DATA (obj)));
   37.78  #endif /* HAVE_BIGNUM */
   37.79  		    }
   37.80  #endif /* HAVE_BIGFLOAT */
   37.81 @@ -687,18 +687,18 @@
   37.82  			}
   37.83  		    }
   37.84  #endif
   37.85 -		  if (INTP (obj))
   37.86 +		  if (FIXNUMP (obj))
   37.87  		    {
   37.88  		      if (strchr (unsigned_int_converters, ch))
   37.89  			{
   37.90  #ifdef HAVE_BIGNUM
   37.91 -			  if (XINT (obj) < 0)
   37.92 +			  if (XFIXNUM (obj) < 0)
   37.93  			    dead_wrong_type_argument (Qnatnump, obj);
   37.94  #endif
   37.95  			  arg.ul = (unsigned long) XUINT (obj);
   37.96  			}
   37.97  		      else
   37.98 -			arg.l = XINT (obj);
   37.99 +			arg.l = XFIXNUM (obj);
  37.100  		    }
  37.101  		}
  37.102  	    }
    38.1 --- a/src/editfns.c	Sat Oct 08 12:26:09 2011 +0100
    38.2 +++ b/src/editfns.c	Sun Oct 09 09:51:57 2011 +0100
    38.3 @@ -142,7 +142,7 @@
    38.4  buildmark (Charbpos val, Lisp_Object buffer)
    38.5  {
    38.6    Lisp_Object mark = Fmake_marker ();
    38.7 -  Fset_marker (mark, make_int (val), buffer);
    38.8 +  Fset_marker (mark, make_fixnum (val), buffer);
    38.9    return mark;
   38.10  }
   38.11  
   38.12 @@ -154,7 +154,7 @@
   38.13         (buffer))
   38.14  {
   38.15    struct buffer *b = decode_buffer (buffer, 1);
   38.16 -  return make_int (BUF_PT (b));
   38.17 +  return make_fixnum (BUF_PT (b));
   38.18  }
   38.19  
   38.20  DEFUN ("point-marker", Fpoint_marker, 0, 2, 0, /*
   38.21 @@ -197,7 +197,7 @@
   38.22    Charbpos n = get_buffer_pos_char (b, position, GB_COERCE_RANGE);
   38.23    BUF_SET_PT (b, n);
   38.24    atomic_extent_goto_char_p = 1;
   38.25 -  return make_int (n);
   38.26 +  return make_fixnum (n);
   38.27  }
   38.28  
   38.29  static Lisp_Object
   38.30 @@ -212,8 +212,8 @@
   38.31  #endif
   38.32    m = Fmarker_position (b->mark);
   38.33    if (NILP (m)) invalid_operation ("There is no region now", Qunbound);
   38.34 -  if (!!(BUF_PT (b) < XINT (m)) == !!beginningp)
   38.35 -    return make_int (BUF_PT (b));
   38.36 +  if (!!(BUF_PT (b) < XFIXNUM (m)) == !!beginningp)
   38.37 +    return make_fixnum (BUF_PT (b));
   38.38    else
   38.39      return m;
   38.40  }
   38.41 @@ -312,8 +312,8 @@
   38.42       incorrect. --ben */
   38.43  
   38.44  #ifdef ERROR_CHECK_TEXT
   38.45 -  assert (XINT (Fpoint (Qnil)) ==
   38.46 -	  XINT (Fmarker_position (Fpoint_marker (Qt, Qnil))));
   38.47 +  assert (XFIXNUM (Fpoint (Qnil)) ==
   38.48 +	  XFIXNUM (Fmarker_position (Fpoint_marker (Qt, Qnil))));
   38.49  #endif
   38.50  
   38.51    b = current_buffer;
   38.52 @@ -415,7 +415,7 @@
   38.53         (buffer))
   38.54  {
   38.55    struct buffer *b = decode_buffer (buffer, 1);
   38.56 -  return make_int (BUF_SIZE (b));
   38.57 +  return make_fixnum (BUF_SIZE (b));
   38.58  }
   38.59  
   38.60  DEFUN ("point-min", Fpoint_min, 0, 1, 0, /*
   38.61 @@ -427,7 +427,7 @@
   38.62         (buffer))
   38.63  {
   38.64    struct buffer *b = decode_buffer (buffer, 1);
   38.65 -  return make_int (BUF_BEGV (b));
   38.66 +  return make_fixnum (BUF_BEGV (b));
   38.67  }
   38.68  
   38.69  DEFUN ("point-min-marker", Fpoint_min_marker, 0, 1, 0, /*
   38.70 @@ -451,7 +451,7 @@
   38.71         (buffer))
   38.72  {
   38.73    struct buffer *b = decode_buffer (buffer, 1);
   38.74 -  return make_int (BUF_ZV (b));
   38.75 +  return make_fixnum (BUF_ZV (b));
   38.76  }
   38.77  
   38.78  DEFUN ("point-max-marker", Fpoint_max_marker, 0, 1, 0, /*
   38.79 @@ -665,8 +665,8 @@
   38.80  
   38.81    if (!NILP (uid))
   38.82      {
   38.83 -      CHECK_INT (uid);
   38.84 -      local_uid = XINT (uid);
   38.85 +      CHECK_FIXNUM (uid);
   38.86 +      local_uid = XFIXNUM (uid);
   38.87        returned_name = user_login_name (&local_uid);
   38.88      }
   38.89    else
   38.90 @@ -750,7 +750,7 @@
   38.91  */
   38.92         ())
   38.93  {
   38.94 -  return make_int (geteuid ());
   38.95 +  return make_fixnum (geteuid ());
   38.96  }
   38.97  
   38.98  DEFUN ("user-real-uid", Fuser_real_uid, 0, 0, 0, /*
   38.99 @@ -758,7 +758,7 @@
  38.100  */
  38.101         ())
  38.102  {
  38.103 -  return make_int (getuid ());
  38.104 +  return make_fixnum (getuid ());
  38.105  }
  38.106  
  38.107  DEFUN ("user-full-name", Fuser_full_name, 0, 1, 0, /*
  38.108 @@ -910,7 +910,7 @@
  38.109  */
  38.110         ())
  38.111  {
  38.112 -  return make_int (qxe_getpid ());
  38.113 +  return make_fixnum (qxe_getpid ());
  38.114  }
  38.115  
  38.116  DEFUN ("current-time", Fcurrent_time, 0, 0, 0, /*
  38.117 @@ -928,9 +928,9 @@
  38.118    EMACS_TIME t;
  38.119  
  38.120    EMACS_GET_TIME (t);
  38.121 -  return list3 (make_int ((EMACS_SECS (t) >> 16) & 0xffff),
  38.122 -		make_int ((EMACS_SECS (t) >> 0)  & 0xffff),
  38.123 -		make_int (EMACS_USECS (t)));
  38.124 +  return list3 (make_fixnum ((EMACS_SECS (t) >> 16) & 0xffff),
  38.125 +		make_fixnum ((EMACS_SECS (t) >> 0)  & 0xffff),
  38.126 +		make_fixnum (EMACS_USECS (t)));
  38.127  }
  38.128  
  38.129  DEFUN ("current-process-time", Fcurrent_process_time, 0, 0, 0, /*
  38.130 @@ -979,10 +979,10 @@
  38.131    low  = XCDR (specified_time);
  38.132    if (CONSP (low))
  38.133      low = XCAR (low);
  38.134 -  CHECK_INT (high);
  38.135 -  CHECK_INT (low);
  38.136 -  *result = (XINT (high) << 16) + (XINT (low) & 0xffff);
  38.137 -  return *result >> 16 == XINT (high);
  38.138 +  CHECK_FIXNUM (high);
  38.139 +  CHECK_FIXNUM (low);
  38.140 +  *result = (XFIXNUM (high) << 16) + (XFIXNUM (low) & 0xffff);
  38.141 +  return *result >> 16 == XFIXNUM (high);
  38.142  }
  38.143  
  38.144  Lisp_Object time_to_lisp (time_t the_time);
  38.145 @@ -990,7 +990,7 @@
  38.146  time_to_lisp (time_t the_time)
  38.147  {
  38.148    unsigned int item = (unsigned int) the_time;
  38.149 -  return Fcons (make_int (item >> 16), make_int (item & 0xffff));
  38.150 +  return Fcons (make_fixnum (item >> 16), make_fixnum (item & 0xffff));
  38.151  }
  38.152  
  38.153  size_t emacs_strftime (Extbyte *string, size_t max, const Extbyte *format,
  38.154 @@ -1111,17 +1111,17 @@
  38.155    decoded_time = gmtime (&time_spec);
  38.156  
  38.157    return listn(9,
  38.158 -	       make_int (save_tm.tm_sec),
  38.159 -	       make_int (save_tm.tm_min),
  38.160 -	       make_int (save_tm.tm_hour),
  38.161 -	       make_int (save_tm.tm_mday),
  38.162 -	       make_int (save_tm.tm_mon + 1),
  38.163 -	       make_int (save_tm.tm_year + 1900),
  38.164 -	       make_int (save_tm.tm_wday),
  38.165 +	       make_fixnum (save_tm.tm_sec),
  38.166 +	       make_fixnum (save_tm.tm_min),
  38.167 +	       make_fixnum (save_tm.tm_hour),
  38.168 +	       make_fixnum (save_tm.tm_mday),
  38.169 +	       make_fixnum (save_tm.tm_mon + 1),
  38.170 +	       make_fixnum (save_tm.tm_year + 1900),
  38.171 +	       make_fixnum (save_tm.tm_wday),
  38.172  	       save_tm.tm_isdst ? Qt : Qnil,
  38.173  	       (decoded_time == NULL)
  38.174  	       ? Qnil
  38.175 -	       : make_int (difftm (&save_tm, decoded_time)));
  38.176 +	       : make_fixnum (difftm (&save_tm, decoded_time)));
  38.177  }
  38.178  
  38.179  static void set_time_zone_rule (Extbyte *tzstring);
  38.180 @@ -1131,8 +1131,8 @@
  38.181  Lisp_Object
  38.182  make_time (time_t tiempo)
  38.183  {
  38.184 -  return list2 (make_int (tiempo < 0 ? tiempo / 0x10000 : tiempo >> 16),
  38.185 -		make_int (tiempo & 0xFFFF));
  38.186 +  return list2 (make_fixnum (tiempo < 0 ? tiempo / 0x10000 : tiempo >> 16),
  38.187 +		make_fixnum (tiempo & 0xFFFF));
  38.188  }
  38.189  
  38.190  DEFUN ("encode-time", Fencode_time, 6, MANY, 0, /*
  38.191 @@ -1161,12 +1161,12 @@
  38.192    struct tm tm;
  38.193    Lisp_Object zone = (nargs > 6) ? args[nargs - 1] : Qnil;
  38.194  
  38.195 -  CHECK_INT (*args); tm.tm_sec  = XINT (*args++);	/* second */
  38.196 -  CHECK_INT (*args); tm.tm_min  = XINT (*args++);	/* minute */
  38.197 -  CHECK_INT (*args); tm.tm_hour = XINT (*args++);	/* hour */
  38.198 -  CHECK_INT (*args); tm.tm_mday = XINT (*args++);	/* day */
  38.199 -  CHECK_INT (*args); tm.tm_mon  = XINT (*args++) - 1;	/* month */
  38.200 -  CHECK_INT (*args); tm.tm_year = XINT (*args++) - 1900;/* year */
  38.201 +  CHECK_FIXNUM (*args); tm.tm_sec  = XFIXNUM (*args++);	/* second */
  38.202 +  CHECK_FIXNUM (*args); tm.tm_min  = XFIXNUM (*args++);	/* minute */
  38.203 +  CHECK_FIXNUM (*args); tm.tm_hour = XFIXNUM (*args++);	/* hour */
  38.204 +  CHECK_FIXNUM (*args); tm.tm_mday = XFIXNUM (*args++);	/* day */
  38.205 +  CHECK_FIXNUM (*args); tm.tm_mon  = XFIXNUM (*args++) - 1;	/* month */
  38.206 +  CHECK_FIXNUM (*args); tm.tm_year = XFIXNUM (*args++) - 1900;/* year */
  38.207  
  38.208    tm.tm_isdst = -1;
  38.209  
  38.210 @@ -1185,10 +1185,10 @@
  38.211  
  38.212        if (STRINGP (zone))
  38.213  	tzstring = LISP_STRING_TO_EXTERNAL (zone, Qtime_zone_encoding);
  38.214 -      else if (INTP (zone))
  38.215 +      else if (FIXNUMP (zone))
  38.216  	{
  38.217 -	  int abszone = abs (XINT (zone));
  38.218 -	  sprintf (tzbuf, "XXX%s%d:%02d:%02d", "-" + (XINT (zone) < 0),
  38.219 +	  int abszone = abs (XFIXNUM (zone));
  38.220 +	  sprintf (tzbuf, "XXX%s%d:%02d:%02d", "-" + (XFIXNUM (zone) < 0),
  38.221  		   abszone / (60*60), (abszone/60) % 60, abszone % 60);
  38.222  	  tzstring = tzbuf;
  38.223  	}
  38.224 @@ -1327,7 +1327,7 @@
  38.225  		      am%60);
  38.226  	  tem = build_istring (buf);
  38.227  	}
  38.228 -      return list2 (make_int (offset), tem);
  38.229 +      return list2 (make_fixnum (offset), tem);
  38.230      }
  38.231    else
  38.232      return list2 (Qnil, Qnil);
  38.233 @@ -1579,8 +1579,8 @@
  38.234      cou = 1;
  38.235    else
  38.236      {
  38.237 -      CHECK_INT (count);
  38.238 -      cou = XINT (count);
  38.239 +      CHECK_FIXNUM (count);
  38.240 +      cou = XFIXNUM (count);
  38.241      }
  38.242  
  38.243    charlen = set_itext_ichar (str, XCHAR (character));
  38.244 @@ -1718,17 +1718,17 @@
  38.245  	  c2 = TRT_TABLE_OF (trt, c2);
  38.246  	}
  38.247        if (c1 < c2)
  38.248 -	return make_int (- 1 - i);
  38.249 +	return make_fixnum (- 1 - i);
  38.250        if (c1 > c2)
  38.251 -	return make_int (i + 1);
  38.252 +	return make_fixnum (i + 1);
  38.253      }
  38.254  
  38.255    /* The strings match as far as they go.
  38.256       If one is shorter, that one is less.  */
  38.257    if (length < len1)
  38.258 -    return make_int (length + 1);
  38.259 +    return make_fixnum (length + 1);
  38.260    else if (length < len2)
  38.261 -    return make_int (- length - 1);
  38.262 +    return make_fixnum (- length - 1);
  38.263  
  38.264    /* Same length too => they are equal.  */
  38.265    return Qzero;
  38.266 @@ -1962,7 +1962,7 @@
  38.267      dead_wrong_type_argument (Qstringp, table);
  38.268    end_multiple_change (buf, mc_count);
  38.269  
  38.270 -  return make_int (cnt);
  38.271 +  return make_fixnum (cnt);
  38.272  }
  38.273  
  38.274  DEFUN ("delete-region", Fdelete_region, 2, 3, "r", /*
  38.275 @@ -2070,8 +2070,8 @@
  38.276  
  38.277       But that was clearly before the advent of marker-insertion-type. --ben */
  38.278  
  38.279 -  Fset_marker (bottom, make_int (BUF_BEGV (buf)), wrap_buffer (buf));
  38.280 -  Fset_marker (top, make_int (BUF_ZV (buf)), wrap_buffer (buf));
  38.281 +  Fset_marker (bottom, make_fixnum (BUF_BEGV (buf)), wrap_buffer (buf));
  38.282 +  Fset_marker (top, make_fixnum (BUF_ZV (buf)), wrap_buffer (buf));
  38.283    Fset_marker_insertion_type (top, Qt);
  38.284  
  38.285    return noseeum_cons (wrap_buffer (buf), noseeum_cons (bottom, top));
    39.1 --- a/src/elhash.c	Sat Oct 08 12:26:09 2011 +0100
    39.2 +++ b/src/elhash.c	Sun Oct 09 09:51:57 2011 +0100
    39.3 @@ -289,9 +289,9 @@
    39.4    res = IGNORE_MULTIPLE_VALUES (Ffuncall (countof (args), args));
    39.5    UNGCPRO;
    39.6  
    39.7 -  if (INTP (res))
    39.8 +  if (FIXNUMP (res))
    39.9      {
   39.10 -      return (Hashcode) (XINT (res));
   39.11 +      return (Hashcode) (XFIXNUM (res));
   39.12      }
   39.13  
   39.14  #ifdef HAVE_BIGNUM
   39.15 @@ -820,7 +820,7 @@
   39.16            /* hash_table_size() can't handle excessively large sizes. */
   39.17            maybe_signal_error_1 (Qargs_out_of_range,
   39.18                                  list3 (value, Qzero,
   39.19 -                                       make_integer (EMACS_INT_MAX)),
   39.20 +                                       make_integer (MOST_POSITIVE_FIXNUM)),
   39.21                                  Qhash_table, errb);
   39.22            return 0;
   39.23          }
   39.24 @@ -841,7 +841,7 @@
   39.25  static Elemcount
   39.26  decode_hash_table_size (Lisp_Object obj)
   39.27  {
   39.28 -  return NILP (obj) ? HASH_TABLE_DEFAULT_SIZE : XINT (obj);
   39.29 +  return NILP (obj) ? HASH_TABLE_DEFAULT_SIZE : XFIXNUM (obj);
   39.30  }
   39.31  
   39.32  static int
   39.33 @@ -1373,11 +1373,11 @@
   39.34        break;
   39.35  
   39.36    if (!HTENTRY_CLEAR_P (probe))
   39.37 -    probe->value = make_int (XINT (probe->value) + offset);
   39.38 +    probe->value = make_fixnum (XFIXNUM (probe->value) + offset);
   39.39    else
   39.40      {
   39.41        probe->key   = key;
   39.42 -      probe->value = make_int (offset);
   39.43 +      probe->value = make_fixnum (offset);
   39.44  
   39.45        if (++ht->count >= ht->rehash_count)
   39.46          {
   39.47 @@ -1490,7 +1490,7 @@
   39.48  */
   39.49         (hash_table))
   39.50  {
   39.51 -  return make_int (xhash_table (hash_table)->count);
   39.52 +  return make_fixnum (xhash_table (hash_table)->count);
   39.53  }
   39.54  
   39.55  DEFUN ("hash-table-test", Fhash_table_test, 1, 1, 0, /*
   39.56 @@ -1511,7 +1511,7 @@
   39.57  */
   39.58         (hash_table))
   39.59  {
   39.60 -  return make_int (xhash_table (hash_table)->size);
   39.61 +  return make_fixnum (xhash_table (hash_table)->size);
   39.62  }
   39.63  
   39.64  DEFUN ("hash-table-rehash-size", Fhash_table_rehash_size, 1, 1, 0, /*
   39.65 @@ -2085,9 +2085,9 @@
   39.66            return LISP_HASH (make_char (CANONCASE (NULL, XCHAR (obj))));
   39.67          }
   39.68  
   39.69 -      if (INTP (obj))
   39.70 +      if (FIXNUMP (obj))
   39.71          {
   39.72 -          return FLOAT_HASHCODE_FROM_DOUBLE ((double) (XINT (obj)));
   39.73 +          return FLOAT_HASHCODE_FROM_DOUBLE ((double) (XFIXNUM (obj)));
   39.74          }
   39.75      }
   39.76  
   39.77 @@ -2206,7 +2206,7 @@
   39.78    min = Ffunction_min_args (equal_function);
   39.79    max = Ffunction_max_args (equal_function);
   39.80  
   39.81 -  if (!((XINT (min) <= 2) && (NILP (max) || 2 <= XINT (max))))
   39.82 +  if (!((XFIXNUM (min) <= 2) && (NILP (max) || 2 <= XFIXNUM (max))))
   39.83      {
   39.84        signal_wrong_number_of_arguments_error (equal_function, 2);
   39.85      }
   39.86 @@ -2214,7 +2214,7 @@
   39.87    min = Ffunction_min_args (hash_function);
   39.88    max = Ffunction_max_args (hash_function);
   39.89  
   39.90 -  if (!((XINT (min) <= 1) && (NILP (max) || 1 <= XINT (max))))
   39.91 +  if (!((XFIXNUM (min) <= 1) && (NILP (max) || 1 <= XFIXNUM (max))))
   39.92      {
   39.93        signal_wrong_number_of_arguments_error (hash_function, 1);
   39.94      }
   39.95 @@ -2403,7 +2403,7 @@
   39.96    assert (!NILP (Fassq (Qeql, weak_list_list)));
   39.97    assert (!NILP (Fassq (Qequal, weak_list_list)));
   39.98    assert (!NILP (Fassq (Qequalp, weak_list_list)));
   39.99 -  assert (4 == XINT (Flength (weak_list_list)));
  39.100 +  assert (4 == XFIXNUM (Flength (weak_list_list)));
  39.101  
  39.102    Vhash_table_test_weak_list = make_weak_list (WEAK_LIST_KEY_ASSOC);
  39.103    XWEAK_LIST_LIST (Vhash_table_test_weak_list) = weak_list_list;
    40.1 --- a/src/emacs.c	Sat Oct 08 12:26:09 2011 +0100
    40.2 +++ b/src/emacs.c	Sun Oct 09 09:51:57 2011 +0100
    40.3 @@ -735,7 +735,7 @@
    40.4  make_argc_argv (Lisp_Object argv_list, int *argc, Wexttext ***argv)
    40.5  {
    40.6    Lisp_Object next;
    40.7 -  int n = XINT (Flength (argv_list));
    40.8 +  int n = XFIXNUM (Flength (argv_list));
    40.9    REGISTER int i;
   40.10    *argv = xnew_array (Wexttext *, n + 1);
   40.11  
   40.12 @@ -2060,7 +2060,7 @@
   40.13  	    - build_cistring()
   40.14  	    - build_ascstring()
   40.15  	    - make_vector()
   40.16 -	    - make_int()
   40.17 +	    - make_fixnum()
   40.18  	    - make_char()
   40.19  	    - make_extent()
   40.20  	    - ALLOC_NORMAL_LISP_OBJECT()
   40.21 @@ -3788,7 +3788,7 @@
   40.22      voodoo_free_hook;
   40.23  #endif
   40.24  
   40.25 -  exit (INTP (arg) ? XINT (arg) : 0);
   40.26 +  exit (FIXNUMP (arg) ? XFIXNUM (arg) : 0);
   40.27    RETURN_NOT_REACHED (Qnil);
   40.28  }
   40.29  
   40.30 @@ -4299,7 +4299,7 @@
   40.31    FSF Emacs:   19.23
   40.32    XEmacs:      19.10
   40.33  */ );
   40.34 -  Vemacs_major_version = make_int (EMACS_MAJOR_VERSION);
   40.35 +  Vemacs_major_version = make_fixnum (EMACS_MAJOR_VERSION);
   40.36  
   40.37    DEFVAR_LISP ("emacs-minor-version", &Vemacs_minor_version /*
   40.38  Minor version number of this version of Emacs, as an integer.
   40.39 @@ -4307,7 +4307,7 @@
   40.40    FSF Emacs:   19.23
   40.41    XEmacs:      19.10
   40.42  */ );
   40.43 -  Vemacs_minor_version = make_int (EMACS_MINOR_VERSION);
   40.44 +  Vemacs_minor_version = make_fixnum (EMACS_MINOR_VERSION);
   40.45  
   40.46    DEFVAR_LISP ("emacs-patch-level", &Vemacs_patch_level /*
   40.47  The patch level of this version of Emacs, as an integer.
   40.48 @@ -4317,7 +4317,7 @@
   40.49  earlier than 21.1.1
   40.50  */ );
   40.51  #ifdef EMACS_PATCH_LEVEL
   40.52 -  Vemacs_patch_level = make_int (EMACS_PATCH_LEVEL);
   40.53 +  Vemacs_patch_level = make_fixnum (EMACS_PATCH_LEVEL);
   40.54  #else
   40.55    Vemacs_patch_level = Qnil;
   40.56  #endif
   40.57 @@ -4329,7 +4329,7 @@
   40.58  earlier than 20.3.
   40.59  */ );
   40.60  #ifdef EMACS_BETA_VERSION
   40.61 -  Vemacs_beta_version = make_int (EMACS_BETA_VERSION);
   40.62 +  Vemacs_beta_version = make_fixnum (EMACS_BETA_VERSION);
   40.63  #else
   40.64    Vemacs_beta_version = Qnil;
   40.65  #endif
    41.1 --- a/src/emodules.c	Sat Oct 08 12:26:09 2011 +0100
    41.2 +++ b/src/emodules.c	Sun Oct 09 09:51:57 2011 +0100
    41.3 @@ -115,7 +115,7 @@
    41.4      mver = XSTRING_DATA (version);
    41.5  
    41.6    dlhandle = 0;
    41.7 -  record_unwind_protect (module_load_unwind, make_int(modnum));
    41.8 +  record_unwind_protect (module_load_unwind, make_fixnum(modnum));
    41.9    emodules_load (mod, mname, mver);
   41.10    unbind_to (speccount);
   41.11  
   41.12 @@ -283,12 +283,12 @@
   41.13  
   41.14    if (CONSP (upto))
   41.15      {
   41.16 -      if (INTP (XCAR (upto)))
   41.17 -        l = XINT (XCAR (upto));
   41.18 +      if (FIXNUMP (XCAR (upto)))
   41.19 +        l = XFIXNUM (XCAR (upto));
   41.20        free_cons (upto);
   41.21      }
   41.22    else
   41.23 -    l = XINT (upto);
   41.24 +    l = XFIXNUM (upto);
   41.25  
   41.26    /*
   41.27     * Here we need to go through and dlclose() (IN REVERSE ORDER!) any
    42.1 --- a/src/eval.c	Sat Oct 08 12:26:09 2011 +0100
    42.2 +++ b/src/eval.c	Sun Oct 09 09:51:57 2011 +0100
    42.3 @@ -1242,7 +1242,7 @@
    42.4    GET_LIST_LENGTH (args, nargs);
    42.5  
    42.6    if (nargs & 1)		/* Odd number of arguments? */
    42.7 -    Fsignal (Qwrong_number_of_arguments, list2 (Qsetq, make_int (nargs)));
    42.8 +    Fsignal (Qwrong_number_of_arguments, list2 (Qsetq, make_fixnum (nargs)));
    42.9  
   42.10    GC_PROPERTY_LIST_LOOP_3 (symbol, val, args)
   42.11      {
   42.12 @@ -1281,7 +1281,7 @@
   42.13    if (nargs != 1)
   42.14      {
   42.15        Fsignal (Qwrong_number_of_arguments,
   42.16 -               list2 (Qquote, make_int (nargs)));
   42.17 +               list2 (Qquote, make_fixnum (nargs)));
   42.18      }
   42.19  
   42.20    return XCAR (args);
   42.21 @@ -1363,7 +1363,7 @@
   42.22    if (nargs != 1)
   42.23      {
   42.24        Fsignal (Qwrong_number_of_arguments,
   42.25 -               list2 (Qfunction, make_int (nargs)));
   42.26 +               list2 (Qfunction, make_fixnum (nargs)));
   42.27      }
   42.28  
   42.29    return XCAR (args);
   42.30 @@ -1410,7 +1410,7 @@
   42.31    /* This function can GC */
   42.32    if (!NILP (Vmacro_declaration_function))
   42.33      {
   42.34 -      Lisp_Object declare = Fnth (make_int (2), args);
   42.35 +      Lisp_Object declare = Fnth (make_fixnum (2), args);
   42.36  
   42.37        /* Sigh. This GNU interface is incompatible with the CL declare macro,
   42.38           and the latter is much older.
   42.39 @@ -1426,7 +1426,7 @@
   42.40  
   42.41        if (STRINGP (declare))
   42.42          {
   42.43 -          declare = Fnth (make_int (3), args);
   42.44 +          declare = Fnth (make_fixnum (3), args);
   42.45          }
   42.46  
   42.47        if (CONSP (declare) && EQ (Qdeclare, XCAR (declare)))
   42.48 @@ -1601,7 +1601,7 @@
   42.49  	  if (EQ (XCAR (def), Qautoload))
   42.50  	    {
   42.51  	      /* Autoloading function: will it be a macro when loaded?  */
   42.52 -	      tem = Felt (def, make_int (4));
   42.53 +	      tem = Felt (def, make_fixnum (4));
   42.54  	      if (EQ (tem, Qt) || EQ (tem, Qmacro))
   42.55  		{
   42.56  		  /* Yes, load it and try again.  */
   42.57 @@ -1929,7 +1929,7 @@
   42.58    GET_LIST_LENGTH (args, nargs);
   42.59    if (nargs != 2)
   42.60      {
   42.61 -      Fsignal (Qwrong_number_of_arguments, list2 (Qthrow, make_int (nargs)));
   42.62 +      Fsignal (Qwrong_number_of_arguments, list2 (Qthrow, make_fixnum (nargs)));
   42.63      }
   42.64  
   42.65    tag = IGNORE_MULTIPLE_VALUES (Feval (XCAR(args)));
   42.66 @@ -2309,8 +2309,8 @@
   42.67    Lisp_Object tem;
   42.68  
   42.69    tem = Ffunction_max_args (args[0]);
   42.70 -  if (! (XINT (Ffunction_min_args (args[0])) <= 1
   42.71 -	 && (NILP (tem) || 1 <= XINT (tem))))
   42.72 +  if (! (XFIXNUM (Ffunction_min_args (args[0])) <= 1
   42.73 +	 && (NILP (tem) || 1 <= XFIXNUM (tem))))
   42.74      invalid_argument ("Must be function of one argument", args[0]);
   42.75  
   42.76    /* (handler-fun . handler-args)  but currently there are no handler-args */
   42.77 @@ -3042,7 +3042,7 @@
   42.78  signal_wrong_number_of_arguments_error (Lisp_Object function, int nargs)
   42.79  {
   42.80    return Fsignal (Qwrong_number_of_arguments,
   42.81 -		  list2 (function, make_int (nargs)));
   42.82 +		  list2 (function, make_fixnum (nargs)));
   42.83  }
   42.84  
   42.85  /* Used in list traversal macros for efficiency. */
   42.86 @@ -3705,7 +3705,7 @@
   42.87        if (EQ (fun, indirect_function (*backtrace_list->function, 0)))
   42.88  	fun = *backtrace_list->function;
   42.89        return Fsignal (Qwrong_number_of_arguments,
   42.90 -		      list2 (fun, make_int (nargs)));
   42.91 +		      list2 (fun, make_fixnum (nargs)));
   42.92      }
   42.93  
   42.94    {
   42.95 @@ -4275,11 +4275,11 @@
   42.96  	      optimize_compiled_function (function);
   42.97  
   42.98        if (function_min_args_p)
   42.99 -	return make_int (f->min_args);
  42.100 +	return make_fixnum (f->min_args);
  42.101        else if (f->max_args == MANY)
  42.102  	return Qnil;
  42.103        else
  42.104 -	return make_int (f->max_args);
  42.105 +	return make_fixnum (f->max_args);
  42.106      }
  42.107    else if (CONSP (function))
  42.108      {
  42.109 @@ -4335,7 +4335,7 @@
  42.110  	  }
  42.111        }
  42.112  
  42.113 -    return make_int (argcount);
  42.114 +    return make_fixnum (argcount);
  42.115    }
  42.116  }
  42.117  
  42.118 @@ -4633,8 +4633,8 @@
  42.119    if (index != 0 &&
  42.120        (index < first_desired || index >= (first_desired + allocated_count)))
  42.121      {
  42.122 -      args_out_of_range (make_int (first_desired),
  42.123 -                         make_int (first_desired + allocated_count));
  42.124 +      args_out_of_range (make_fixnum (first_desired),
  42.125 +                         make_fixnum (first_desired + allocated_count));
  42.126      }
  42.127  
  42.128    mv->contents[index == 0 ? 0 : 1 + (index - first_desired)] = value;
  42.129 @@ -4650,8 +4650,8 @@
  42.130    if (index != 0 &&
  42.131        (index < first_desired || index >= (first_desired + allocated_count)))
  42.132      {
  42.133 -      args_out_of_range (make_int (first_desired),
  42.134 -                         make_int (first_desired + allocated_count));
  42.135 +      args_out_of_range (make_fixnum (first_desired),
  42.136 +                         make_fixnum (first_desired + allocated_count));
  42.137      }
  42.138  
  42.139    return mv->contents[index == 0 ? 0 : 1 + (index - first_desired)];
  42.140 @@ -4758,7 +4758,7 @@
  42.141  
  42.142    if (upper > Vmultiple_values_limit)
  42.143      {
  42.144 -      args_out_of_range (make_int (upper), make_int (Vmultiple_values_limit));
  42.145 +      args_out_of_range (make_fixnum (upper), make_fixnum (Vmultiple_values_limit));
  42.146      }
  42.147  
  42.148    /* In the event that something back up the stack wants more multiple
  42.149 @@ -4793,7 +4793,7 @@
  42.150  multiple_value_call (int nargs, Lisp_Object *args)
  42.151  {
  42.152    /* The argument order here is horrible: */
  42.153 -  int i, speccount = XINT (args[3]);
  42.154 +  int i, speccount = XFIXNUM (args[3]);
  42.155    Lisp_Object result = Qnil, head = Fcons (args[0], Qnil), list_offset; 
  42.156    struct gcpro gcpro1, gcpro2;
  42.157    Lisp_Object apply_args[2];
  42.158 @@ -4866,13 +4866,13 @@
  42.159    gcpro1.nvars = ++i; 
  42.160  
  42.161    /* The argument order is horrible here. */
  42.162 -  constructed_args[i] = make_int (0);
  42.163 +  constructed_args[i] = make_fixnum (0);
  42.164    gcpro1.nvars = ++i;
  42.165 -  constructed_args[i] = make_int (Vmultiple_values_limit);
  42.166 +  constructed_args[i] = make_fixnum (Vmultiple_values_limit);
  42.167    gcpro1.nvars = ++i;
  42.168  
  42.169    speccount = bind_multiple_value_limits (0, Vmultiple_values_limit);
  42.170 -  constructed_args[i] = make_int (speccount);
  42.171 +  constructed_args[i] = make_fixnum (speccount);
  42.172    gcpro1.nvars = ++i;
  42.173  
  42.174    {
  42.175 @@ -4889,8 +4889,8 @@
  42.176  Lisp_Object
  42.177  multiple_value_list_internal (int nargs, Lisp_Object *args)
  42.178  {
  42.179 -  int first = XINT (args[0]), upper = XINT (args[1]),
  42.180 -    speccount = XINT(args[2]);
  42.181 +  int first = XFIXNUM (args[0]), upper = XFIXNUM (args[1]),
  42.182 +    speccount = XFIXNUM(args[2]);
  42.183    Lisp_Object result = Qnil;
  42.184  
  42.185    assert (nargs == 4);
  42.186 @@ -4955,7 +4955,7 @@
  42.187    if (nargs != 3)
  42.188      {
  42.189        Fsignal (Qwrong_number_of_arguments,
  42.190 -               list2 (Qmultiple_value_list_internal, make_int (nargs)));
  42.191 +               list2 (Qmultiple_value_list_internal, make_fixnum (nargs)));
  42.192      }
  42.193  
  42.194    argv[0] = IGNORE_MULTIPLE_VALUES (Feval (XCAR (args)));
  42.195 @@ -4966,11 +4966,11 @@
  42.196    args = XCDR (args);
  42.197    argv[1] = IGNORE_MULTIPLE_VALUES (Feval (XCAR (args)));
  42.198  
  42.199 -  check_integer_range (argv[1], Qzero, make_int (EMACS_INT_MAX));
  42.200 +  check_integer_range (argv[1], Qzero, make_fixnum (MOST_POSITIVE_FIXNUM));
  42.201    check_integer_range (argv[0], Qzero, argv[1]);
  42.202  
  42.203 -  upper = XINT (argv[1]);
  42.204 -  first = XINT (argv[0]);
  42.205 +  upper = XFIXNUM (argv[1]);
  42.206 +  first = XFIXNUM (argv[0]);
  42.207  
  42.208    gcpro1.nvars = 2;
  42.209  
  42.210 @@ -4978,7 +4978,7 @@
  42.211       the alternative would be to encode the number of arguments in the
  42.212       bytecode stream, which complicates things if we have more than 255
  42.213       arguments. */
  42.214 -  argv[2] = make_int (bind_multiple_value_limits (first, upper));
  42.215 +  argv[2] = make_fixnum (bind_multiple_value_limits (first, upper));
  42.216    gcpro1.nvars = 3;
  42.217    args = XCDR (args);
  42.218  
  42.219 @@ -7046,9 +7046,9 @@
  42.220    REGISTER struct backtrace *backlist = backtrace_list;
  42.221    REGISTER int i;
  42.222  
  42.223 -  CHECK_INT (level);
  42.224 -
  42.225 -  for (i = 0; backlist && i < XINT (level); i++)
  42.226 +  CHECK_FIXNUM (level);
  42.227 +
  42.228 +  for (i = 0; backlist && i < XFIXNUM (level); i++)
  42.229      {
  42.230        backlist = backlist->next;
  42.231      }
  42.232 @@ -7123,9 +7123,9 @@
  42.233    entering_debugger = 0;
  42.234  
  42.235    if (!NILP (detailed))
  42.236 -    Vprint_level = make_int (50);
  42.237 +    Vprint_level = make_fixnum (50);
  42.238    else
  42.239 -    Vprint_level = make_int (3);
  42.240 +    Vprint_level = make_fixnum (3);
  42.241    print_readably = 0;
  42.242    print_escape_newlines = 1;
  42.243  
  42.244 @@ -7243,10 +7243,10 @@
  42.245    REGISTER int i;
  42.246    Lisp_Object tem;
  42.247  
  42.248 -  check_integer_range (nframes, Qzero, make_integer (EMACS_INT_MAX));
  42.249 +  check_integer_range (nframes, Qzero, make_integer (MOST_POSITIVE_FIXNUM));
  42.250  
  42.251    /* Find the frame requested.  */
  42.252 -  for (i = XINT (nframes); backlist && (i-- > 0);)
  42.253 +  for (i = XFIXNUM (nframes); backlist && (i-- > 0);)
  42.254      backlist = backlist->next;
  42.255  
  42.256    if (!backlist)
  42.257 @@ -7600,7 +7600,7 @@
  42.258  This applies to `values', `values-list', `multiple-value-bind' and related
  42.259  macros and special operators.
  42.260  */);
  42.261 -  Vmultiple_values_limit = EMACS_INT_MAX > INT_MAX ? INT_MAX : EMACS_INT_MAX;
  42.262 +  Vmultiple_values_limit = MOST_POSITIVE_FIXNUM > INT_MAX ? INT_MAX : MOST_POSITIVE_FIXNUM;
  42.263  
  42.264    DEFVAR_LISP ("macro-declaration-function", &Vmacro_declaration_function /*
  42.265  Function to process declarations in a macro definition.
    43.1 --- a/src/event-Xt.c	Sat Oct 08 12:26:09 2011 +0100
    43.2 +++ b/src/event-Xt.c	Sun Oct 09 09:51:57 2011 +0100
    43.3 @@ -569,10 +569,10 @@
    43.4  	      && ((xd->last_downkey
    43.5  		   && ((keycode != xd->last_downkey
    43.6  			|| ev->xkey.time != xd->release_time)))
    43.7 -		  || (INTP (Vmodifier_keys_sticky_time)
    43.8 +		  || (FIXNUMP (Vmodifier_keys_sticky_time)
    43.9  		      && ev->xkey.time
   43.10  		      > (xd->modifier_release_time
   43.11 -			 + XINT (Vmodifier_keys_sticky_time))))))
   43.12 +			 + XFIXNUM (Vmodifier_keys_sticky_time))))))
   43.13  	{
   43.14  	  xd->need_to_add_mask = 0;
   43.15  	  xd->last_downkey = 0;
   43.16 @@ -630,9 +630,9 @@
   43.17  	}
   43.18  
   43.19        if (xd->modifier_release_time
   43.20 -	  && INTP (Vmodifier_keys_sticky_time)
   43.21 +	  && FIXNUMP (Vmodifier_keys_sticky_time)
   43.22  	  && (ev->xkey.time
   43.23 -	      > xd->modifier_release_time + XINT (Vmodifier_keys_sticky_time)))
   43.24 +	      > xd->modifier_release_time + XFIXNUM (Vmodifier_keys_sticky_time)))
   43.25  	{
   43.26  	  xd->need_to_add_mask = 0;
   43.27  	  xd->down_mask = 0;
    44.1 --- a/src/event-msw.c	Sat Oct 08 12:26:09 2011 +0100
    44.2 +++ b/src/event-msw.c	Sun Oct 09 09:51:57 2011 +0100
    44.3 @@ -1764,7 +1764,7 @@
    44.4     * If the read didn't get to the end of the string, we have a syntax
    44.5     * error in the string supplied by the user.
    44.6     */
    44.7 -  if (XINT (XCDR (obj)) != XSTRING_LENGTH (str))
    44.8 +  if (XFIXNUM (XCDR (obj)) != XSTRING_LENGTH (str))
    44.9      return Qnil;
   44.10  
   44.11    GCPRO1 (obj);
    45.1 --- a/src/event-stream.c	Sat Oct 08 12:26:09 2011 +0100
    45.2 +++ b/src/event-stream.c	Sun Oct 09 09:51:57 2011 +0100
    45.3 @@ -715,7 +715,7 @@
    45.4    if (echo_area_active (f) && !EQ (Qcommand, echo_area_status (f)))
    45.5      goto done;
    45.6  
    45.7 -  if (INTP (Vecho_keystrokes) || FLOATP (Vecho_keystrokes))
    45.8 +  if (FIXNUMP (Vecho_keystrokes) || FLOATP (Vecho_keystrokes))
    45.9      echo_keystrokes = extract_float (Vecho_keystrokes);
   45.10    else
   45.11      echo_keystrokes = 0;
   45.12 @@ -1236,10 +1236,10 @@
   45.13  static unsigned long
   45.14  lisp_number_to_milliseconds (Lisp_Object secs, int allow_0)
   45.15  {
   45.16 -  Lisp_Object args[] = { allow_0 ? Qzero : make_int (1),
   45.17 +  Lisp_Object args[] = { allow_0 ? Qzero : make_fixnum (1),
   45.18                           secs,
   45.19                           /* (((unsigned int) 0xFFFFFFFF) / 1000) - 1 */
   45.20 -                         make_int (4294967 - 1) };
   45.21 +                         make_fixnum (4294967 - 1) };
   45.22  
   45.23    if (!allow_0 && FLOATP (secs) && XFLOAT_DATA (secs) > 0)
   45.24      {
   45.25 @@ -1251,12 +1251,12 @@
   45.26        args_out_of_range_3 (secs, args[0], args[2]);
   45.27      }
   45.28    
   45.29 -  args[0] = make_int (1000);
   45.30 +  args[0] = make_fixnum (1000);
   45.31    args[0] = Ftimes (2, args);
   45.32  
   45.33 -  if (INTP (args[0]))
   45.34 +  if (FIXNUMP (args[0]))
   45.35      {
   45.36 -      return XINT (args[0]);
   45.37 +      return XFIXNUM (args[0]);
   45.38      }
   45.39  
   45.40    return (unsigned long) extract_float (args[0]);
   45.41 @@ -1304,8 +1304,8 @@
   45.42    int id;
   45.43    Lisp_Object lid;
   45.44    id = event_stream_generate_wakeup (msecs, msecs2, function, object, 0);
   45.45 -  lid = make_int (id);
   45.46 -  assert (id == XINT (lid));
   45.47 +  lid = make_fixnum (id);
   45.48 +  assert (id == XFIXNUM (lid));
   45.49    return lid;
   45.50  }
   45.51  
   45.52 @@ -1320,8 +1320,8 @@
   45.53  */
   45.54         (id))
   45.55  {
   45.56 -  CHECK_INT (id);
   45.57 -  event_stream_disable_wakeup (XINT (id), 0);
   45.58 +  CHECK_FIXNUM (id);
   45.59 +  event_stream_disable_wakeup (XFIXNUM (id), 0);
   45.60    return Qnil;
   45.61  }
   45.62  
   45.63 @@ -1383,8 +1383,8 @@
   45.64    int id;
   45.65    Lisp_Object lid;
   45.66    id = event_stream_generate_wakeup (msecs, msecs2, function, object, 1);
   45.67 -  lid = make_int (id);
   45.68 -  assert (id == XINT (lid));
   45.69 +  lid = make_fixnum (id);
   45.70 +  assert (id == XFIXNUM (lid));
   45.71    return lid;
   45.72  }
   45.73  
   45.74 @@ -1399,8 +1399,8 @@
   45.75  */
   45.76         (id))
   45.77  {
   45.78 -  CHECK_INT (id);
   45.79 -  event_stream_disable_wakeup (XINT (id), 1);
   45.80 +  CHECK_FIXNUM (id);
   45.81 +  event_stream_disable_wakeup (XFIXNUM (id), 1);
   45.82    return Qnil;
   45.83  }
   45.84  
   45.85 @@ -1798,7 +1798,7 @@
   45.86    if (!NILP (Vunread_command_event))
   45.87      how_many--;
   45.88  
   45.89 -  how_many -= XINT (Fsafe_length (Vunread_command_events));
   45.90 +  how_many -= XFIXNUM (Fsafe_length (Vunread_command_events));
   45.91  
   45.92    if (how_many <= 0)
   45.93      return 1;
   45.94 @@ -2348,16 +2348,16 @@
   45.95      EMACS_GET_TIME (t);
   45.96      if (!CONSP (Vlast_input_time))
   45.97        Vlast_input_time = Fcons (Qnil, Qnil);
   45.98 -    XCAR (Vlast_input_time) = make_int ((EMACS_SECS (t) >> 16) & 0xffff);
   45.99 -    XCDR (Vlast_input_time) = make_int ((EMACS_SECS (t) >> 0)  & 0xffff);
  45.100 +    XCAR (Vlast_input_time) = make_fixnum ((EMACS_SECS (t) >> 16) & 0xffff);
  45.101 +    XCDR (Vlast_input_time) = make_fixnum ((EMACS_SECS (t) >> 0)  & 0xffff);
  45.102      if (!CONSP (Vlast_command_event_time))
  45.103        Vlast_command_event_time = list3 (Qnil, Qnil, Qnil);
  45.104      XCAR (Vlast_command_event_time) =
  45.105 -      make_int ((EMACS_SECS (t) >> 16) & 0xffff);
  45.106 +      make_fixnum ((EMACS_SECS (t) >> 16) & 0xffff);
  45.107      XCAR (XCDR (Vlast_command_event_time)) =
  45.108 -      make_int ((EMACS_SECS (t) >> 0)  & 0xffff);
  45.109 +      make_fixnum ((EMACS_SECS (t) >> 0)  & 0xffff);
  45.110      XCAR (XCDR (XCDR (Vlast_command_event_time)))
  45.111 -      = make_int (EMACS_USECS (t));
  45.112 +      = make_fixnum (EMACS_USECS (t));
  45.113    }
  45.114    /* If this key came from the keyboard or from a keyboard macro, then
  45.115       it goes into the recent-keys and this-command-keys vectors.
  45.116 @@ -2626,8 +2626,8 @@
  45.117        if (!NILP (timeout_msecs))
  45.118  	{
  45.119            check_integer_range (timeout_msecs, Qzero,
  45.120 -                               make_integer (EMACS_INT_MAX));
  45.121 -	  msecs += XINT (timeout_msecs);
  45.122 +                               make_integer (MOST_POSITIVE_FIXNUM));
  45.123 +	  msecs += XFIXNUM (timeout_msecs);
  45.124  	}
  45.125        if (msecs)
  45.126          {
  45.127 @@ -2640,7 +2640,7 @@
  45.128  
  45.129    count = specpdl_depth ();
  45.130    record_unwind_protect (sit_for_unwind,
  45.131 -			 timeout_enabled ? make_int (timeout_id) : Qnil);
  45.132 +			 timeout_enabled ? make_fixnum (timeout_id) : Qnil);
  45.133    recursive_sit_for = 1;
  45.134  
  45.135    while (!done &&
  45.136 @@ -2704,7 +2704,7 @@
  45.137  	}
  45.138      }
  45.139  
  45.140 -  unbind_to_1 (count, timeout_enabled ? make_int (timeout_id) : Qnil);
  45.141 +  unbind_to_1 (count, timeout_enabled ? make_fixnum (timeout_id) : Qnil);
  45.142  
  45.143    Fdeallocate_event (event);
  45.144  
  45.145 @@ -2737,7 +2737,7 @@
  45.146    event = Fmake_event (Qnil, Qnil);
  45.147  
  45.148    count = specpdl_depth ();
  45.149 -  record_unwind_protect (sit_for_unwind, make_int (id));
  45.150 +  record_unwind_protect (sit_for_unwind, make_fixnum (id));
  45.151    recursive_sit_for = 1;
  45.152  
  45.153    while (1)
  45.154 @@ -2771,7 +2771,7 @@
  45.155  	}
  45.156      }
  45.157   DONE_LABEL:
  45.158 -  unbind_to_1 (count, make_int (id));
  45.159 +  unbind_to_1 (count, make_fixnum (id));
  45.160    Fdeallocate_event (event);
  45.161    UNGCPRO;
  45.162    return Qnil;
  45.163 @@ -2843,7 +2843,7 @@
  45.164    id = event_stream_generate_wakeup (msecs, 0, Qnil, Qnil, 0);
  45.165  
  45.166    count = specpdl_depth ();
  45.167 -  record_unwind_protect (sit_for_unwind, make_int (id));
  45.168 +  record_unwind_protect (sit_for_unwind, make_fixnum (id));
  45.169    recursive_sit_for = 1;
  45.170  
  45.171    while (1)
  45.172 @@ -2892,7 +2892,7 @@
  45.173      }
  45.174  
  45.175   DONE_LABEL:
  45.176 -  unbind_to_1 (count, make_int (id));
  45.177 +  unbind_to_1 (count, make_fixnum (id));
  45.178  
  45.179    /* Put back the event (if any) that made Fsit_for() exit before the
  45.180       timeout.  Note that it is being added to the back of the queue, which
  45.181 @@ -3717,7 +3717,7 @@
  45.182      {
  45.183        check_integer_range (number, Qzero,
  45.184                             make_integer (ARRAY_DIMENSION_LIMIT));
  45.185 -      nwanted = XINT (number);
  45.186 +      nwanted = XFIXNUM (number);
  45.187      }
  45.188  
  45.189    /* Create the keys ring vector, if none present. */
  45.190 @@ -3771,7 +3771,7 @@
  45.191  */
  45.192         ())
  45.193  {
  45.194 -  return make_int (recent_keys_ring_size);
  45.195 +  return make_fixnum (recent_keys_ring_size);
  45.196  }
  45.197  
  45.198  DEFUN ("set-recent-keys-ring-size", Fset_recent_keys_ring_size, 1, 1, 0, /*
  45.199 @@ -3783,14 +3783,14 @@
  45.200    int i, j, nkeys, start, min;
  45.201    struct gcpro gcpro1;
  45.202  
  45.203 -  CHECK_INT (size);
  45.204 -  if (XINT (size) <= 0)
  45.205 +  CHECK_FIXNUM (size);
  45.206 +  if (XFIXNUM (size) <= 0)
  45.207      invalid_argument ("Recent keys ring size must be positive", size);
  45.208 -  if (XINT (size) == recent_keys_ring_size)
  45.209 +  if (XFIXNUM (size) == recent_keys_ring_size)
  45.210      return size;
  45.211  
  45.212    GCPRO1 (new_vector);
  45.213 -  new_vector = make_vector (XINT (size), Qnil);
  45.214 +  new_vector = make_vector (XFIXNUM (size), Qnil);
  45.215  
  45.216    if (NILP (Vrecent_keys_ring))
  45.217      {
  45.218 @@ -3810,10 +3810,10 @@
  45.219        start = ((recent_keys_ring_index == nkeys) ? 0 : recent_keys_ring_index);
  45.220      }
  45.221  
  45.222 -  if (XINT (size) > nkeys)
  45.223 +  if (XFIXNUM (size) > nkeys)
  45.224      min = nkeys;
  45.225    else
  45.226 -    min = XINT (size);
  45.227 +    min = XFIXNUM (size);
  45.228  
  45.229    for (i = 0, j = start; i < min; i++)
  45.230      {
  45.231 @@ -3821,7 +3821,7 @@
  45.232        if (++j >= recent_keys_ring_size)
  45.233  	j = 0;
  45.234      }
  45.235 -  recent_keys_ring_size = XINT (size);
  45.236 +  recent_keys_ring_size = XFIXNUM (size);
  45.237    recent_keys_ring_index = (i < recent_keys_ring_size) ? i : 0;
  45.238  
  45.239    Vrecent_keys_ring = new_vector;
  45.240 @@ -4570,9 +4570,9 @@
  45.241  		if (NATNUMP (prop))
  45.242                    {
  45.243                      magic_undo = 1;
  45.244 -                    if (INTP (prop))
  45.245 +                    if (FIXNUMP (prop))
  45.246                        {
  45.247 -                        magic_undo_count = XINT (prop);
  45.248 +                        magic_undo_count = XFIXNUM (prop);
  45.249                        }
  45.250  #ifdef HAVE_BIGNUM
  45.251                      else if (BIGNUMP (prop)
  45.252 @@ -4873,7 +4873,7 @@
  45.253    /* This junk is so that timestamps don't get to be negative, but contain
  45.254       as many bits as this particular emacs will allow.
  45.255     */
  45.256 -  return make_int (EMACS_INT_MAX & tiempo);
  45.257 +  return make_fixnum (MOST_POSITIVE_FIXNUM & tiempo);
  45.258  }
  45.259  
  45.260  
  45.261 @@ -4989,7 +4989,7 @@
  45.262    DEFVAR_LISP ("echo-keystrokes", &Vecho_keystrokes /*
  45.263  *Nonzero means echo unfinished commands after this many seconds of pause.
  45.264  */ );
  45.265 -  Vecho_keystrokes = make_int (1);
  45.266 +  Vecho_keystrokes = make_fixnum (1);
  45.267  
  45.268    DEFVAR_INT ("auto-save-interval", &auto_save_interval /*
  45.269  *Number of keyboard input characters between auto-saves.
  45.270 @@ -5223,7 +5223,7 @@
  45.271  This variable has no effect when `modifier-keys-are-sticky' is nil.
  45.272  Currently only implemented under X Window System.
  45.273  */ );
  45.274 -  Vmodifier_keys_sticky_time = make_int (500);
  45.275 +  Vmodifier_keys_sticky_time = make_fixnum (500);
  45.276  
  45.277    Vcontrolling_terminal = Qnil;
  45.278    staticpro (&Vcontrolling_terminal);
    46.1 --- a/src/event-xlike-inc.c	Sat Oct 08 12:26:09 2011 +0100
    46.2 +++ b/src/event-xlike-inc.c	Sun Oct 09 09:51:57 2011 +0100
    46.3 @@ -172,7 +172,7 @@
    46.4        && map[keysym - FIRST_KNOWN_##map ]) do				\
    46.5      {									\
    46.6        keysym -= FIRST_KNOWN_##map ;					\
    46.7 -      return Funicode_to_char (make_int (map[keysym]), Qnil);		\
    46.8 +      return Funicode_to_char (make_fixnum (map[keysym]), Qnil);		\
    46.9      } while (0)
   46.10  
   46.11  /* Maps to Unicode for X11 KeySyms, where we don't have a direct internal
   46.12 @@ -603,7 +603,7 @@
   46.13       #x01000000-#x01000100. */
   46.14  
   46.15    if (keysym >= 0x01000000 && keysym <= 0x0110FFFF)
   46.16 -    return Funicode_to_char (make_int (keysym & 0xffffff), Qnil);
   46.17 +    return Funicode_to_char (make_fixnum (keysym & 0xffffff), Qnil);
   46.18  
   46.19    if ((keysym & 0xff) < 0xa0)
   46.20      return Qnil;
   46.21 @@ -697,7 +697,7 @@
   46.22      case 32: /* Currency. The lower sixteen bits of these keysyms happily
   46.23  		correspond exactly to the Unicode code points of the
   46.24  		associated characters */
   46.25 -      return Funicode_to_char (make_int (keysym & 0xffff), Qnil);
   46.26 +      return Funicode_to_char (make_fixnum (keysym & 0xffff), Qnil);
   46.27        break;
   46.28      default:
   46.29        break;
    47.1 --- a/src/events.c	Sat Oct 08 12:26:09 2011 +0100
    47.2 +++ b/src/events.c	Sun Oct 09 09:51:57 2011 +0100
    47.3 @@ -323,11 +323,11 @@
    47.4        {
    47.5  	Lisp_Object Vx, Vy;
    47.6  	Vx = Fevent_x_pixel (obj);
    47.7 -	assert (INTP (Vx));
    47.8 +	assert (FIXNUMP (Vx));
    47.9  	Vy = Fevent_y_pixel (obj);
   47.10 -	assert (INTP (Vy));
   47.11 +	assert (FIXNUMP (Vy));
   47.12  	write_fmt_string (printcharfun, "#<motion-event %ld, %ld",
   47.13 -			  (long) XINT (Vx), (long) XINT (Vy));
   47.14 +			  (long) XFIXNUM (Vx), (long) XFIXNUM (Vy));
   47.15  	break;
   47.16        }
   47.17      case process_event:
   47.18 @@ -639,16 +639,16 @@
   47.19  	  }
   47.20  	else if (EQ (keyword, Qbutton))
   47.21  	  {
   47.22 -	    check_integer_range (value, Qzero, make_int (26));
   47.23 +	    check_integer_range (value, Qzero, make_fixnum (26));
   47.24  
   47.25  	    switch (EVENT_TYPE (e))
   47.26  	      {
   47.27  	      case button_press_event:
   47.28  	      case button_release_event:
   47.29 -		SET_EVENT_BUTTON_BUTTON (e, XINT (value));
   47.30 +		SET_EVENT_BUTTON_BUTTON (e, XFIXNUM (value));
   47.31  		break;
   47.32  	      case misc_user_event:
   47.33 -		SET_EVENT_MISC_USER_BUTTON (e, XINT (value));
   47.34 +		SET_EVENT_MISC_USER_BUTTON (e, XFIXNUM (value));
   47.35  		break;
   47.36  	      default:
   47.37  		WRONG_EVENT_TYPE_FOR_PROPERTY (type, keyword);
   47.38 @@ -707,8 +707,8 @@
   47.39  	      case misc_user_event:
   47.40  		/* Allow negative values, so we can specify toolbar
   47.41  		   positions.  */
   47.42 -		CHECK_INT (value);
   47.43 -		coord_x = XINT (value);
   47.44 +		CHECK_FIXNUM (value);
   47.45 +		coord_x = XFIXNUM (value);
   47.46  		break;
   47.47  	      default:
   47.48  		WRONG_EVENT_TYPE_FOR_PROPERTY (type, keyword);
   47.49 @@ -724,8 +724,8 @@
   47.50  	      case button_release_event:
   47.51  	      case misc_user_event:
   47.52  		/* Allow negative values; see above. */
   47.53 -		CHECK_INT (value);
   47.54 -		coord_y = XINT (value);
   47.55 +		CHECK_FIXNUM (value);
   47.56 +		coord_y = XFIXNUM (value);
   47.57  		break;
   47.58  	      default:
   47.59  		WRONG_EVENT_TYPE_FOR_PROPERTY (type, keyword);
   47.60 @@ -741,11 +741,11 @@
   47.61                  SET_EVENT_TIMESTAMP (e, bignum_to_uint (XBIGNUM_DATA (value)));
   47.62                }
   47.63  #else
   47.64 -            check_integer_range (value, Qzero, make_integer (EMACS_INT_MAX));
   47.65 +            check_integer_range (value, Qzero, make_integer (MOST_POSITIVE_FIXNUM));
   47.66  #endif
   47.67 -            if (INTP (value))
   47.68 +            if (FIXNUMP (value))
   47.69                {
   47.70 -                SET_EVENT_TIMESTAMP (e, XINT (value));
   47.71 +                SET_EVENT_TIMESTAMP (e, XFIXNUM (value));
   47.72                }
   47.73              else
   47.74                {
   47.75 @@ -1456,7 +1456,7 @@
   47.76  nth_of_key_sequence_as_event (Lisp_Object seq, int n, Lisp_Object event)
   47.77  {
   47.78    assert (STRINGP (seq) || VECTORP (seq));
   47.79 -  assert (n < XINT (Flength (seq)));
   47.80 +  assert (n < XFIXNUM (Flength (seq)));
   47.81  
   47.82    if (STRINGP (seq))
   47.83      {
   47.84 @@ -1476,7 +1476,7 @@
   47.85  Lisp_Object
   47.86  key_sequence_to_event_chain (Lisp_Object seq)
   47.87  {
   47.88 -  int len = XINT (Flength (seq));
   47.89 +  int len = XFIXNUM (Flength (seq));
   47.90    int i;
   47.91    Lisp_Object head = Qnil, tail = Qnil;
   47.92  
   47.93 @@ -1763,10 +1763,10 @@
   47.94       bignums on builds that support them, but that involves consing and
   47.95       doesn't work on builds that don't support bignums.
   47.96     */
   47.97 -  return make_int (EMACS_INT_MAX & XEVENT_TIMESTAMP (event));
   47.98 +  return make_fixnum (MOST_POSITIVE_FIXNUM & XEVENT_TIMESTAMP (event));
   47.99  }
  47.100  
  47.101 -#define TIMESTAMP_HALFSPACE (1L << (INT_VALBITS - 2))
  47.102 +#define TIMESTAMP_HALFSPACE (1L << (FIXNUM_VALBITS - 2))
  47.103  
  47.104  DEFUN ("event-timestamp<", Fevent_timestamp_lessp, 2, 2, 0, /*
  47.105  Return true if timestamp TIME1 is earlier than timestamp TIME2.
  47.106 @@ -1777,11 +1777,11 @@
  47.107  {
  47.108    EMACS_INT t1, t2;
  47.109  
  47.110 -  check_integer_range (time1, Qzero, make_integer (EMACS_INT_MAX));
  47.111 -  check_integer_range (time2, Qzero, make_integer (EMACS_INT_MAX));
  47.112 +  check_integer_range (time1, Qzero, make_integer (MOST_POSITIVE_FIXNUM));
  47.113 +  check_integer_range (time2, Qzero, make_integer (MOST_POSITIVE_FIXNUM));
  47.114  
  47.115 -  t1 = XINT (time1);
  47.116 -  t2 = XINT (time2);
  47.117 +  t1 = XFIXNUM (time1);
  47.118 +  t2 = XFIXNUM (time2);
  47.119  
  47.120    if (t1 < t2)
  47.121      return t2 - t1 < TIMESTAMP_HALFSPACE ? Qt : Qnil;
  47.122 @@ -1835,9 +1835,9 @@
  47.123  		     misc_user_event, Qbutton_event_p);
  47.124  #ifdef HAVE_WINDOW_SYSTEM
  47.125    if (XEVENT_TYPE (event) == misc_user_event)
  47.126 -    return make_int (XEVENT_MISC_USER_BUTTON (event));
  47.127 +    return make_fixnum (XEVENT_MISC_USER_BUTTON (event));
  47.128    else
  47.129 -    return make_int (XEVENT_BUTTON_BUTTON (event));
  47.130 +    return make_fixnum (XEVENT_BUTTON_BUTTON (event));
  47.131  #else /* !HAVE_WINDOW_SYSTEM */
  47.132    return Qzero;
  47.133  #endif /* !HAVE_WINDOW_SYSTEM */
  47.134 @@ -1855,14 +1855,14 @@
  47.135    switch (XEVENT_TYPE (event))
  47.136      {
  47.137      case key_press_event:
  47.138 -      return make_int (XEVENT_KEY_MODIFIERS (event));
  47.139 +      return make_fixnum (XEVENT_KEY_MODIFIERS (event));
  47.140      case button_press_event:
  47.141      case button_release_event:
  47.142 -      return make_int (XEVENT_BUTTON_MODIFIERS (event));
  47.143 +      return make_fixnum (XEVENT_BUTTON_MODIFIERS (event));
  47.144      case pointer_motion_event:
  47.145 -      return make_int (XEVENT_MOTION_MODIFIERS (event));
  47.146 +      return make_fixnum (XEVENT_MOTION_MODIFIERS (event));
  47.147      case misc_user_event:
  47.148 -      return make_int (XEVENT_MISC_USER_MODIFIERS (event));
  47.149 +      return make_fixnum (XEVENT_MISC_USER_MODIFIERS (event));
  47.150      default:
  47.151        event = wrong_type_argument (intern ("key-or-mouse-event-p"), event);
  47.152        goto again;
  47.153 @@ -1914,7 +1914,7 @@
  47.154  */
  47.155         (event))
  47.156  {
  47.157 -  int mod = XINT (Fevent_modifier_bits (event));
  47.158 +  int mod = XFIXNUM (Fevent_modifier_bits (event));
  47.159    Lisp_Object result = Qnil;
  47.160    struct gcpro gcpro1;
  47.161  
  47.162 @@ -1995,7 +1995,7 @@
  47.163    if (!event_x_y_pixel_internal (event, &x, &y, 1))
  47.164      return wrong_type_argument (Qmouse_event_p, event);
  47.165    else
  47.166 -    return make_int (x);
  47.167 +    return make_fixnum (x);
  47.168  }
  47.169  
  47.170  DEFUN ("event-window-y-pixel", Fevent_window_y_pixel, 1, 1, 0, /*
  47.171 @@ -2013,7 +2013,7 @@
  47.172    if (!event_x_y_pixel_internal (event, &x, &y, 1))
  47.173      return wrong_type_argument (Qmouse_event_p, event);
  47.174    else
  47.175 -    return make_int (y);
  47.176 +    return make_fixnum (y);
  47.177  }
  47.178  
  47.179  DEFUN ("event-x-pixel", Fevent_x_pixel, 1, 1, 0, /*
  47.180 @@ -2031,7 +2031,7 @@
  47.181    if (!event_x_y_pixel_internal (event, &x, &y, 0))
  47.182      return wrong_type_argument (Qmouse_event_p, event);
  47.183    else
  47.184 -    return make_int (x);
  47.185 +    return make_fixnum (x);
  47.186  }
  47.187  
  47.188  DEFUN ("event-y-pixel", Fevent_y_pixel, 1, 1, 0, /*
  47.189 @@ -2049,7 +2049,7 @@
  47.190    if (!event_x_y_pixel_internal (event, &x, &y, 0))
  47.191      return wrong_type_argument (Qmouse_event_p, event);
  47.192    else
  47.193 -    return make_int (y);
  47.194 +    return make_fixnum (y);
  47.195  }
  47.196  
  47.197  /* Given an event, return a value:
  47.198 @@ -2269,7 +2269,7 @@
  47.199  
  47.200    event_pixel_translation (event, 0, 0, 0, 0, &w, &bufp, 0, 0, 0, 0);
  47.201  
  47.202 -  return w && bufp ? make_int (bufp) : Qnil;
  47.203 +  return w && bufp ? make_fixnum (bufp) : Qnil;
  47.204  }
  47.205  
  47.206  DEFUN ("event-closest-point", Fevent_closest_point, 1, 1, 0, /*
  47.207 @@ -2290,7 +2290,7 @@
  47.208  
  47.209    event_pixel_translation (event, 0, 0, 0, 0, 0, 0, &bufp, 0, 0, 0);
  47.210  
  47.211 -  return bufp ? make_int (bufp) : Qnil;
  47.212 +  return bufp ? make_fixnum (bufp) : Qnil;
  47.213  }
  47.214  
  47.215  DEFUN ("event-x", Fevent_x, 1, 1, 0, /*
  47.216 @@ -2303,7 +2303,7 @@
  47.217  
  47.218    event_pixel_translation (event, &char_x, 0, 0, 0, 0, 0, 0, 0, 0, 0);
  47.219  
  47.220 -  return make_int (char_x);
  47.221 +  return make_fixnum (char_x);
  47.222  }
  47.223  
  47.224  DEFUN ("event-y", Fevent_y, 1, 1, 0, /*
  47.225 @@ -2316,7 +2316,7 @@
  47.226  
  47.227    event_pixel_translation (event, 0, &char_y, 0, 0, 0, 0, 0, 0, 0, 0);
  47.228  
  47.229 -  return make_int (char_y);
  47.230 +  return make_fixnum (char_y);
  47.231  }
  47.232  
  47.233  DEFUN ("event-modeline-position", Fevent_modeline_position, 1, 1, 0, /*
  47.234 @@ -2335,7 +2335,7 @@
  47.235  
  47.236    where = event_pixel_translation (event, 0, 0, 0, 0, 0, 0, 0, &mbufp, 0, 0);
  47.237  
  47.238 -  return (mbufp < 0 || where != OVER_MODELINE) ? Qnil : make_int (mbufp);
  47.239 +  return (mbufp < 0 || where != OVER_MODELINE) ? Qnil : make_fixnum (mbufp);
  47.240  }
  47.241  
  47.242  DEFUN ("event-glyph", Fevent_glyph, 1, 1, 0, /*
  47.243 @@ -2378,7 +2378,7 @@
  47.244  
  47.245    event_pixel_translation (event, 0, 0, &obj_x, 0, &w, 0, 0, 0, 0, &extent);
  47.246  
  47.247 -  return w && EXTENTP (extent) ? make_int (obj_x) : Qnil;
  47.248 +  return w && EXTENTP (extent) ? make_fixnum (obj_x) : Qnil;
  47.249  }
  47.250  
  47.251  DEFUN ("event-glyph-y-pixel", Fevent_glyph_y_pixel, 1, 1, 0, /*
  47.252 @@ -2394,7 +2394,7 @@
  47.253  
  47.254    event_pixel_translation (event, 0, 0, 0, &obj_y, &w, 0, 0, 0, 0, &extent);
  47.255  
  47.256 -  return w && EXTENTP (extent) ? make_int (obj_y) : Qnil;
  47.257 +  return w && EXTENTP (extent) ? make_fixnum (obj_y) : Qnil;
  47.258  }
  47.259  
  47.260  DEFUN ("event-toolbar-button", Fevent_toolbar_button, 1, 1, 0, /*
  47.261 @@ -2494,7 +2494,7 @@
  47.262      case timeout_event:
  47.263        props = cons3 (Qobject,	Fevent_object	(event), props);
  47.264        props = cons3 (Qfunction, Fevent_function (event), props);
  47.265 -      props = cons3 (Qid, make_int (EVENT_TIMEOUT_ID_NUMBER (e)), props);
  47.266 +      props = cons3 (Qid, make_fixnum (EVENT_TIMEOUT_ID_NUMBER (e)), props);
  47.267        break;
  47.268  
  47.269      case key_press_event:
    48.1 --- a/src/extents.c	Sat Oct 08 12:26:09 2011 +0100
    48.2 +++ b/src/extents.c	Sun Oct 09 09:51:57 2011 +0100
    48.3 @@ -2851,8 +2851,8 @@
    48.4      strcpy (bp, "detached");
    48.5    else
    48.6      sprintf (bp, "%ld, %ld",
    48.7 -	     XINT (Fextent_start_position (obj)),
    48.8 -	     XINT (Fextent_end_position (obj)));
    48.9 +	     XFIXNUM (Fextent_start_position (obj)),
   48.10 +	     XFIXNUM (Fextent_end_position (obj)));
   48.11    bp += strlen (bp);
   48.12    *bp++ = (extent_end_open_p (anc) ? ')': ']');
   48.13    if (!NILP (extent_end_glyph (anc))) *bp++ = '*';
   48.14 @@ -3129,7 +3129,7 @@
   48.15    if (extent_detached_p (extent))
   48.16      return Qnil;
   48.17    else
   48.18 -    return make_int (extent_endpoint_char (extent, endp));
   48.19 +    return make_fixnum (extent_endpoint_char (extent, endp));
   48.20  }
   48.21  
   48.22  DEFUN ("extentp", Fextentp, 1, 1, 0, /*
   48.23 @@ -3186,7 +3186,7 @@
   48.24         (extent))
   48.25  {
   48.26    EXTENT e = decode_extent (extent, DE_MUST_BE_ATTACHED);
   48.27 -  return make_int (extent_endpoint_char (e, 1)
   48.28 +  return make_fixnum (extent_endpoint_char (e, 1)
   48.29  		   - extent_endpoint_char (e, 0));
   48.30  }
   48.31  
   48.32 @@ -3294,7 +3294,7 @@
   48.33  
   48.34    xpos = get_buffer_or_string_pos_byte (obj, pos, GB_ALLOW_PAST_ACCESSIBLE);
   48.35    xpos = extent_find_end_of_run (obj, xpos, 1);
   48.36 -  return make_int (buffer_or_string_bytexpos_to_charxpos (obj, xpos));
   48.37 +  return make_fixnum (buffer_or_string_bytexpos_to_charxpos (obj, xpos));
   48.38  }
   48.39  
   48.40  DEFUN ("previous-extent-change", Fprevious_extent_change, 1, 2, 0, /*
   48.41 @@ -3310,7 +3310,7 @@
   48.42  
   48.43    xpos = get_buffer_or_string_pos_byte (obj, pos, GB_ALLOW_PAST_ACCESSIBLE);
   48.44    xpos = extent_find_beginning_of_run (obj, xpos, 1);
   48.45 -  return make_int (buffer_or_string_bytexpos_to_charxpos (obj, xpos));
   48.46 +  return make_fixnum (buffer_or_string_bytexpos_to_charxpos (obj, xpos));
   48.47  }
   48.48  
   48.49  
   48.50 @@ -4658,8 +4658,8 @@
   48.51      return 0;
   48.52  
   48.53    exobj = wrap_extent (extent);
   48.54 -  startobj = make_int (closure->start);
   48.55 -  endobj = make_int (closure->end);
   48.56 +  startobj = make_fixnum (closure->start);
   48.57 +  endobj = make_fixnum (closure->end);
   48.58  
   48.59    /* Now that we are sure to call elisp, set up an unwind-protect so
   48.60       inside_change_hook gets restored in case we throw.  Also record
   48.61 @@ -4776,8 +4776,8 @@
   48.62          maliciously side-effects the returned lists.
   48.63       */
   48.64  
   48.65 -  len = XINT (Flength (list));
   48.66 -  thelen = XINT (Flength (Vextent_face_reusable_list));
   48.67 +  len = XFIXNUM (Flength (list));
   48.68 +  thelen = XFIXNUM (Flength (Vextent_face_reusable_list));
   48.69    oldtail = Qnil;
   48.70    tail = Qnil;
   48.71    GCPRO1 (oldtail);
   48.72 @@ -4792,7 +4792,7 @@
   48.73        cons = Vextent_face_reusable_list;
   48.74        while (!NILP (XCDR (cons)))
   48.75  	cons = XCDR (cons);
   48.76 -      XCDR (cons) = Fmake_list (make_int (len - thelen), Qnil);
   48.77 +      XCDR (cons) = Fmake_list (make_fixnum (len - thelen), Qnil);
   48.78      }
   48.79    else if (thelen > len)
   48.80      {
   48.81 @@ -5139,9 +5139,9 @@
   48.82  {
   48.83    EXTENT e = decode_extent (extent, 0);
   48.84  
   48.85 -  CHECK_INT (priority);
   48.86 +  CHECK_FIXNUM (priority);
   48.87    e = extent_ancestor (e);
   48.88 -  set_extent_priority (e, XINT (priority));
   48.89 +  set_extent_priority (e, XFIXNUM (priority));
   48.90    signal_extent_property_changed (e, Qpriority, 1);
   48.91    return priority;
   48.92  }
   48.93 @@ -5152,7 +5152,7 @@
   48.94         (extent))
   48.95  {
   48.96    EXTENT e = decode_extent (extent, 0);
   48.97 -  return make_int (extent_priority (e));
   48.98 +  return make_fixnum (extent_priority (e));
   48.99  }
  48.100  
  48.101  DEFUN ("set-extent-property", Fset_extent_property, 3, 3, 0, /*
  48.102 @@ -5510,7 +5510,7 @@
  48.103    else if (EQ (property, Qend_closed))
  48.104      return extent_end_open_p (e) ? Qnil : Qt;
  48.105    else if (EQ (property, Qpriority))
  48.106 -    return make_int (extent_priority (e));
  48.107 +    return make_fixnum (extent_priority (e));
  48.108    else if (EQ (property, Qread_only))
  48.109      return extent_read_only (e);
  48.110    else if (EQ (property, Qinvisible))
  48.111 @@ -5601,7 +5601,7 @@
  48.112      ADD_PROP (Qbegin_glyph, extent_begin_glyph (anc));
  48.113  
  48.114    if (extent_priority (anc) != 0)
  48.115 -    ADD_PROP (Qpriority, make_int (extent_priority (anc)));
  48.116 +    ADD_PROP (Qpriority, make_fixnum (extent_priority (anc)));
  48.117  
  48.118    if (!NILP (extent_initial_redisplay_function (anc)))
  48.119      ADD_PROP (Qinitial_redisplay_function,
  48.120 @@ -5754,9 +5754,9 @@
  48.121        GCPRO3 (extent, copy_fn, object);
  48.122        if (BUFFERP (object))
  48.123  	flag = call3_in_buffer (XBUFFER (object), copy_fn, extent,
  48.124 -				make_int (from), make_int (to));
  48.125 +				make_fixnum (from), make_fixnum (to));
  48.126        else
  48.127 -	flag = call3 (copy_fn, extent, make_int (from), make_int (to));
  48.128 +	flag = call3 (copy_fn, extent, make_fixnum (from), make_fixnum (to));
  48.129        UNGCPRO;
  48.130        if (NILP (flag) || !EXTENT_LIVE_P (XEXTENT (extent)))
  48.131  	return 0;
  48.132 @@ -6887,7 +6887,7 @@
  48.133    if (blim < 0)
  48.134      return Qnil;
  48.135    else
  48.136 -    return make_int (buffer_or_string_bytexpos_to_charxpos (object, blim));
  48.137 +    return make_fixnum (buffer_or_string_bytexpos_to_charxpos (object, blim));
  48.138  }
  48.139  
  48.140  DEFUN ("next-single-property-change", Fnext_single_property_change,
    49.1 --- a/src/file-coding.c	Sat Oct 08 12:26:09 2011 +0100
    49.2 +++ b/src/file-coding.c	Sun Oct 09 09:51:57 2011 +0100
    49.3 @@ -467,7 +467,7 @@
    49.4           allocated up to this point is safe_chars, and that's
    49.5           reachable from its entry in
    49.6           Vdefault_query_coding_region_chartab_cache */
    49.7 -      call3 (Qquery_coding_clear_highlights, make_int (pos), make_int (end),
    49.8 +      call3 (Qquery_coding_clear_highlights, make_fixnum (pos), make_fixnum (end),
    49.9               wrap_buffer (buf));
   49.10      }
   49.11  
   49.12 @@ -521,8 +521,8 @@
   49.13  
   49.14                fail_range_end = pos;
   49.15  
   49.16 -              Fput_range_table (make_int (fail_range_start), 
   49.17 -                                make_int (fail_range_end),
   49.18 +              Fput_range_table (make_fixnum (fail_range_start), 
   49.19 +                                make_fixnum (fail_range_end),
   49.20                                  Qunencodable,
   49.21                                  result);
   49.22                previous_failed_reason = query_coding_succeeded;
   49.23 @@ -530,12 +530,12 @@
   49.24                if (flags & QUERY_METHOD_HIGHLIGHT) 
   49.25                  {
   49.26                    Lisp_Object extent
   49.27 -                    = Fmake_extent (make_int (fail_range_start),
   49.28 -                                    make_int (fail_range_end), 
   49.29 +                    = Fmake_extent (make_fixnum (fail_range_start),
   49.30 +                                    make_fixnum (fail_range_end), 
   49.31                                      wrap_buffer (buf));
   49.32                    
   49.33                    Fset_extent_priority
   49.34 -                    (extent, make_int (2 + mouse_highlight_priority));
   49.35 +                    (extent, make_fixnum (2 + mouse_highlight_priority));
   49.36                    Fset_extent_face (extent, Qquery_coding_warning_face);
   49.37                  }
   49.38              }
   49.39 @@ -2299,7 +2299,7 @@
   49.40      if (!NILP (auto_outstream))
   49.41        Lstream_delete (XLSTREAM (auto_outstream));
   49.42      Lstream_delete (XLSTREAM (lb_outstream));
   49.43 -    return make_int (retlen);
   49.44 +    return make_fixnum (retlen);
   49.45    }
   49.46  }
   49.47  
   49.48 @@ -4293,7 +4293,7 @@
   49.49    if (data->level == -1)
   49.50      write_ascstring (printcharfun, "default");
   49.51    else
   49.52 -    print_internal (make_int (data->level), printcharfun, 0);
   49.53 +    print_internal (make_fixnum (data->level), printcharfun, 0);
   49.54    write_ascstring (printcharfun, ")");
   49.55  }
   49.56  
   49.57 @@ -4308,8 +4308,8 @@
   49.58  	data->level = -1;
   49.59        else
   49.60  	{
   49.61 -	  check_integer_range (value, Qzero, make_int (9));
   49.62 -	  data->level = XINT (value);
   49.63 +	  check_integer_range (value, Qzero, make_fixnum (9));
   49.64 +	  data->level = XFIXNUM (value);
   49.65  	}
   49.66      }
   49.67    else
   49.68 @@ -4327,7 +4327,7 @@
   49.69      {
   49.70        if (data->level == -1)
   49.71  	return Qdefault;
   49.72 -      return make_int (data->level);
   49.73 +      return make_fixnum (data->level);
   49.74      }
   49.75  
   49.76    return Qunbound;
    50.1 --- a/src/fileio.c	Sat Oct 08 12:26:09 2011 +0100
    50.2 +++ b/src/fileio.c	Sun Oct 09 09:51:57 2011 +0100
    50.3 @@ -173,13 +173,13 @@
    50.4  {
    50.5    if (CONSP (fd))
    50.6      {
    50.7 -      if (INTP (XCAR (fd)))
    50.8 -	retry_close (XINT (XCAR (fd)));
    50.9 +      if (FIXNUMP (XCAR (fd)))
   50.10 +	retry_close (XFIXNUM (XCAR (fd)));
   50.11  
   50.12        free_cons (fd);
   50.13      }
   50.14    else
   50.15 -    retry_close (XINT (fd));
   50.16 +    retry_close (XFIXNUM (fd));
   50.17  
   50.18    return Qnil;
   50.19  }
   50.20 @@ -1851,9 +1851,9 @@
   50.21      }
   50.22  
   50.23    if (NILP (ok_if_already_exists)
   50.24 -      || INTP (ok_if_already_exists))
   50.25 +      || FIXNUMP (ok_if_already_exists))
   50.26      barf_or_query_if_file_exists (newname, "copy to it",
   50.27 -				  INTP (ok_if_already_exists), &out_st);
   50.28 +				  FIXNUMP (ok_if_already_exists), &out_st);
   50.29    else if (qxe_stat (XSTRING_DATA (newname), &out_st) < 0)
   50.30      out_st.st_mode = 0;
   50.31  
   50.32 @@ -1862,7 +1862,7 @@
   50.33    if (ifd < 0)
   50.34      report_file_error ("Opening input file", filename);
   50.35  
   50.36 -  record_unwind_protect (close_file_unwind, make_int (ifd));
   50.37 +  record_unwind_protect (close_file_unwind, make_fixnum (ifd));
   50.38  
   50.39    /* We can only copy regular files and symbolic links.  Other files are not
   50.40       copyable by us. */
   50.41 @@ -1903,7 +1903,7 @@
   50.42      report_file_error ("Opening output file", newname);
   50.43  
   50.44    {
   50.45 -    Lisp_Object ofd_locative = noseeum_cons (make_int (ofd), Qnil);
   50.46 +    Lisp_Object ofd_locative = noseeum_cons (make_fixnum (ofd), Qnil);
   50.47  
   50.48      record_unwind_protect (close_file_unwind, ofd_locative);
   50.49  
   50.50 @@ -2091,9 +2091,9 @@
   50.51      }
   50.52  
   50.53    if (NILP (ok_if_already_exists)
   50.54 -      || INTP (ok_if_already_exists))
   50.55 +      || FIXNUMP (ok_if_already_exists))
   50.56      barf_or_query_if_file_exists (newname, "rename to it",
   50.57 -				  INTP (ok_if_already_exists), 0);
   50.58 +				  FIXNUMP (ok_if_already_exists), 0);
   50.59  
   50.60    /* We have configure check for rename() and emulate using
   50.61       link()/unlink() if necessary. */
   50.62 @@ -2152,9 +2152,9 @@
   50.63  			   newname, ok_if_already_exists));
   50.64  
   50.65    if (NILP (ok_if_already_exists)
   50.66 -      || INTP (ok_if_already_exists))
   50.67 +      || FIXNUMP (ok_if_already_exists))
   50.68      barf_or_query_if_file_exists (newname, "make it a new name",
   50.69 -				  INTP (ok_if_already_exists), 0);
   50.70 +				  FIXNUMP (ok_if_already_exists), 0);
   50.71    /* #### Emacs 20.6 contains an implementation of link() in w32.c.
   50.72       Need to port. */
   50.73  #ifndef HAVE_LINK
   50.74 @@ -2217,9 +2217,9 @@
   50.75  
   50.76  #ifdef HAVE_SYMLINK
   50.77    if (NILP (ok_if_already_exists)
   50.78 -      || INTP (ok_if_already_exists))
   50.79 +      || FIXNUMP (ok_if_already_exists))
   50.80      barf_or_query_if_file_exists (linkname, "make it a link",
   50.81 -				  INTP (ok_if_already_exists), 0);
   50.82 +				  FIXNUMP (ok_if_already_exists), 0);
   50.83  
   50.84    qxe_unlink (XSTRING_DATA (linkname));
   50.85    if (0 > qxe_symlink (XSTRING_DATA (filename),
   50.86 @@ -2746,7 +2746,7 @@
   50.87  #endif /* WIN32_NATIVE */
   50.88  #endif /* 0 */
   50.89  
   50.90 -  return make_int (st.st_mode & 07777);
   50.91 +  return make_fixnum (st.st_mode & 07777);
   50.92  }
   50.93  
   50.94  DEFUN ("set-file-modes", Fset_file_modes, 2, 2, 0, /*
   50.95 @@ -2764,7 +2764,7 @@
   50.96    abspath = Fexpand_file_name (filename, current_buffer->directory);
   50.97    UNGCPRO;
   50.98  
   50.99 -  CHECK_INT (mode);
  50.100 +  CHECK_FIXNUM (mode);
  50.101  
  50.102    /* If the file name has special constructs in it,
  50.103       call the corresponding file handler.  */
  50.104 @@ -2774,7 +2774,7 @@
  50.105    if (!NILP (handler))
  50.106      return call3 (handler, Qset_file_modes, abspath, mode);
  50.107  
  50.108 -  if (qxe_chmod (XSTRING_DATA (abspath), XINT (mode)) < 0)
  50.109 +  if (qxe_chmod (XSTRING_DATA (abspath), XFIXNUM (mode)) < 0)
  50.110      report_file_error ("Doing chmod", abspath);
  50.111  
  50.112    return Qnil;
  50.113 @@ -2789,9 +2789,9 @@
  50.114  */
  50.115         (mode))
  50.116  {
  50.117 -  CHECK_INT (mode);
  50.118 -
  50.119 -  umask ((~ XINT (mode)) & 0777);
  50.120 +  CHECK_FIXNUM (mode);
  50.121 +
  50.122 +  umask ((~ XFIXNUM (mode)) & 0777);
  50.123  
  50.124    return Qnil;
  50.125  }
  50.126 @@ -2809,7 +2809,7 @@
  50.127    mode = umask (0);
  50.128    umask (mode);
  50.129  
  50.130 -  return make_int ((~ mode) & 0777);
  50.131 +  return make_fixnum ((~ mode) & 0777);
  50.132  }
  50.133  
  50.134  DEFUN ("unix-sync", Funix_sync, 0, 0, "", /*
  50.135 @@ -2973,12 +2973,12 @@
  50.136  #endif /* S_IFREG */
  50.137  
  50.138    if (!NILP (start))
  50.139 -    CHECK_INT (start);
  50.140 +    CHECK_FIXNUM (start);
  50.141    else
  50.142      start = Qzero;
  50.143  
  50.144    if (!NILP (end))
  50.145 -    CHECK_INT (end);
  50.146 +    CHECK_FIXNUM (end);
  50.147  
  50.148    if (fd < 0)
  50.149      {
  50.150 @@ -2991,7 +2991,7 @@
  50.151    if (!NILP (replace))
  50.152      record_unwind_protect (restore_point_unwind, Fpoint_marker (Qnil, Qnil));
  50.153  
  50.154 -  record_unwind_protect (close_file_unwind, make_int (fd));
  50.155 +  record_unwind_protect (close_file_unwind, make_fixnum (fd));
  50.156  
  50.157    /* Supposedly happens on VMS.  */
  50.158    if (st.st_size < 0)
  50.159 @@ -3001,8 +3001,8 @@
  50.160      {
  50.161        if (!not_regular)
  50.162  	{
  50.163 -	  end = make_int (st.st_size);
  50.164 -	  if (XINT (end) != st.st_size)
  50.165 +	  end = make_fixnum (st.st_size);
  50.166 +	  if (XFIXNUM (end) != st.st_size)
  50.167  	    out_of_memory ("Maximum buffer size exceeded", Qunbound);
  50.168  	}
  50.169      }
  50.170 @@ -3142,8 +3142,8 @@
  50.171  	    same_at_end += overlap;
  50.172  
  50.173  	  /* Arrange to read only the nonmatching middle part of the file.  */
  50.174 -	  start = make_int (same_at_start - BUF_BEGV (buf));
  50.175 -	  end = make_int (st.st_size - (BUF_ZV (buf) - same_at_end));
  50.176 +	  start = make_fixnum (same_at_start - BUF_BEGV (buf));
  50.177 +	  end = make_fixnum (st.st_size - (BUF_ZV (buf) - same_at_end));
  50.178  
  50.179  	  buffer_delete_range (buf, same_at_start, same_at_end,
  50.180  			       !NILP (visit) ? INSDEL_NO_LOCKING : 0);
  50.181 @@ -3154,10 +3154,10 @@
  50.182  
  50.183    if (!not_regular)
  50.184      {
  50.185 -      total = XINT (end) - XINT (start);
  50.186 +      total = XFIXNUM (end) - XFIXNUM (start);
  50.187  
  50.188        /* Make sure point-max won't overflow after this insertion.  */
  50.189 -      if (total != XINT (make_int (total)))
  50.190 +      if (total != XFIXNUM (make_fixnum (total)))
  50.191  	out_of_memory ("Maximum buffer size exceeded", Qunbound);
  50.192      }
  50.193    else
  50.194 @@ -3165,13 +3165,13 @@
  50.195         will make the stream functions read as much as possible.  */
  50.196      total = -1;
  50.197  
  50.198 -  if (XINT (start) != 0
  50.199 +  if (XFIXNUM (start) != 0
  50.200        /* why was this here? asked jwz.  The reason is that the replace-mode
  50.201  	 connivings above will normally put the file pointer other than
  50.202  	 where it should be. */
  50.203        || (!NILP (replace) && do_speedy_insert))
  50.204      {
  50.205 -      if (lseek (fd, XINT (start), 0) < 0)
  50.206 +      if (lseek (fd, XFIXNUM (start), 0) < 0)
  50.207  	report_file_error ("Setting file position", filename);
  50.208      }
  50.209  
  50.210 @@ -3257,7 +3257,7 @@
  50.211  	call1 (Qcompute_buffer_file_truename, wrap_buffer (buf));
  50.212        BUF_SAVE_MODIFF (buf) = BUF_MODIFF (buf);
  50.213        buf->auto_save_modified = BUF_MODIFF (buf);
  50.214 -      buf->saved_size = make_int (BUF_SIZE (buf));
  50.215 +      buf->saved_size = make_fixnum (BUF_SIZE (buf));
  50.216  #ifdef CLASH_DETECTION
  50.217        if (!NILP (buf->file_truename))
  50.218  	unlock_file (buf->file_truename);
  50.219 @@ -3277,21 +3277,21 @@
  50.220    /* Decode file format */
  50.221    if (inserted > 0 && !UNBOUNDP (XSYMBOL_FUNCTION (Qformat_decode)))
  50.222      {
  50.223 -      Lisp_Object insval = call3 (Qformat_decode, Qnil, make_int (inserted),
  50.224 +      Lisp_Object insval = call3 (Qformat_decode, Qnil, make_fixnum (inserted),
  50.225  				  visit);
  50.226 -      CHECK_INT (insval);
  50.227 -      inserted = XINT (insval);
  50.228 +      CHECK_FIXNUM (insval);
  50.229 +      inserted = XFIXNUM (insval);
  50.230      }
  50.231  
  50.232    if (inserted > 0)
  50.233      {
  50.234        GC_EXTERNAL_LIST_LOOP_2 (p, Vafter_insert_file_functions)
  50.235  	{
  50.236 -	  Lisp_Object insval = call1 (p, make_int (inserted));
  50.237 +	  Lisp_Object insval = call1 (p, make_fixnum (inserted));
  50.238  	  if (!NILP (insval))
  50.239  	    {
  50.240 -              check_integer_range (insval, Qzero, make_int (EMACS_INT_MAX));
  50.241 -	      inserted = XINT (insval);
  50.242 +              check_integer_range (insval, Qzero, make_fixnum (MOST_POSITIVE_FIXNUM));
  50.243 +	      inserted = XFIXNUM (insval);
  50.244  	    }
  50.245  	}
  50.246        END_GC_EXTERNAL_LIST_LOOP (p);
  50.247 @@ -3302,7 +3302,7 @@
  50.248    if (!NILP (val))
  50.249      return (val);
  50.250    else
  50.251 -    return (list2 (filename, make_int (inserted)));
  50.252 +    return (list2 (filename, make_fixnum (inserted)));
  50.253  }
  50.254  
  50.255  
  50.256 @@ -3423,7 +3423,7 @@
  50.257  	if (visiting)
  50.258  	  {
  50.259  	    BUF_SAVE_MODIFF (current_buffer) = BUF_MODIFF (current_buffer);
  50.260 -	    current_buffer->saved_size = make_int (BUF_SIZE (current_buffer));
  50.261 +	    current_buffer->saved_size = make_fixnum (BUF_SIZE (current_buffer));
  50.262  	    current_buffer->filename = visit_file;
  50.263  	    MARK_MODELINE_CHANGED;
  50.264  	  }
  50.265 @@ -3481,7 +3481,7 @@
  50.266      }
  50.267  
  50.268    {
  50.269 -    Lisp_Object desc_locative = Fcons (make_int (desc), Qnil);
  50.270 +    Lisp_Object desc_locative = Fcons (make_fixnum (desc), Qnil);
  50.271      Lisp_Object instream = Qnil, outstream = Qnil;
  50.272      struct gcpro nngcpro1, nngcpro2;
  50.273      NNGCPRO2 (instream, outstream);
  50.274 @@ -3600,7 +3600,7 @@
  50.275    if (visiting)
  50.276      {
  50.277        BUF_SAVE_MODIFF (current_buffer) = BUF_MODIFF (current_buffer);
  50.278 -      current_buffer->saved_size = make_int (BUF_SIZE (current_buffer));
  50.279 +      current_buffer->saved_size = make_fixnum (BUF_SIZE (current_buffer));
  50.280        current_buffer->filename = visit_file;
  50.281        MARK_MODELINE_CHANGED;
  50.282      }
  50.283 @@ -3668,8 +3668,8 @@
  50.284  	 been dealt with by this function.  */
  50.285        if (current_buffer != given_buffer)
  50.286  	{
  50.287 -	  start = make_int (BUF_BEGV (current_buffer));
  50.288 -	  end = make_int (BUF_ZV (current_buffer));
  50.289 +	  start = make_fixnum (BUF_BEGV (current_buffer));
  50.290 +	  end = make_fixnum (BUF_ZV (current_buffer));
  50.291  	  annotations = Qnil;
  50.292  	}
  50.293        Flength (res);     /* Check basic validity of return value */
  50.294 @@ -3700,8 +3700,8 @@
  50.295  		   original_buffer);
  50.296        if (current_buffer != given_buffer)
  50.297  	{
  50.298 -	  start = make_int (BUF_BEGV (current_buffer));
  50.299 -	  end = make_int (BUF_ZV (current_buffer));
  50.300 +	  start = make_fixnum (BUF_BEGV (current_buffer));
  50.301 +	  end = make_fixnum (BUF_ZV (current_buffer));
  50.302  	  annotations = Qnil;
  50.303  	}
  50.304        Flength (res);
  50.305 @@ -3742,8 +3742,8 @@
  50.306    while (LISTP (*annot))
  50.307      {
  50.308        tem = Fcar_safe (Fcar (*annot));
  50.309 -      if (INTP (tem))
  50.310 -	nextpos = XINT (tem);
  50.311 +      if (FIXNUMP (tem))
  50.312 +	nextpos = XFIXNUM (tem);
  50.313        else
  50.314  	nextpos = INT_MAX;
  50.315  #ifdef MULE
  50.316 @@ -3985,11 +3985,11 @@
  50.317    clear_echo_area (selected_frame (), Qauto_saving, 1);
  50.318    Fding (Qt, Qauto_save_error, Qnil);
  50.319    message ("Auto-saving...error for %s", XSTRING_DATA (current_buffer->name));
  50.320 -  Fsleep_for (make_int (1));
  50.321 +  Fsleep_for (make_fixnum (1));
  50.322    message ("Auto-saving...error!for %s", XSTRING_DATA (current_buffer->name));
  50.323 -  Fsleep_for (make_int (1));
  50.324 +  Fsleep_for (make_fixnum (1));
  50.325    message ("Auto-saving...error for %s", XSTRING_DATA (current_buffer->name));
  50.326 -  Fsleep_for (make_int (1));
  50.327 +  Fsleep_for (make_fixnum (1));
  50.328    return Qnil;
  50.329  }
  50.330  
  50.331 @@ -4055,7 +4055,7 @@
  50.332  static Lisp_Object
  50.333  do_auto_save_unwind (Lisp_Object fd)
  50.334  {
  50.335 -  retry_close (XINT (fd));
  50.336 +  retry_close (XFIXNUM (fd));
  50.337    return (fd);
  50.338  }
  50.339  
  50.340 @@ -4147,7 +4147,7 @@
  50.341  	      && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b)
  50.342  	      && b->auto_save_modified < BUF_MODIFF (b)
  50.343  	      /* -1 means we've turned off autosaving for a while--see below.  */
  50.344 -	      && XINT (b->saved_size) >= 0
  50.345 +	      && XFIXNUM (b->saved_size) >= 0
  50.346  	      && (do_handled_files
  50.347  		  || NILP (Ffind_file_name_handler (b->auto_save_file_name,
  50.348  						    Qwrite_region))))
  50.349 @@ -4163,11 +4163,11 @@
  50.350  		continue;
  50.351  
  50.352  	      if (!preparing_for_armageddon &&
  50.353 -		  (XINT (b->saved_size) * 10
  50.354 +		  (XFIXNUM (b->saved_size) * 10
  50.355  		   > (BUF_Z (b) - BUF_BEG (b)) * 13)
  50.356  		  /* A short file is likely to change a large fraction;
  50.357  		     spare the user annoying messages.  */
  50.358 -		  && XINT (b->saved_size) > 5000
  50.359 +		  && XFIXNUM (b->saved_size) > 5000
  50.360  		  /* These messages are frequent and annoying for `*mail*'.  */
  50.361  		  && !NILP (b->filename)
  50.362  		  && NILP (no_message)
  50.363 @@ -4182,9 +4182,9 @@
  50.364  		     XSTRING_DATA (b->name));
  50.365  		  /* Turn off auto-saving until there's a real save,
  50.366  		     and prevent any more warnings.  */
  50.367 -		  b->saved_size = make_int (-1);
  50.368 +		  b->saved_size = make_fixnum (-1);
  50.369  		  if (!gc_in_progress)
  50.370 -		    Fsleep_for (make_int (1));
  50.371 +		    Fsleep_for (make_fixnum (1));
  50.372  		  continue;
  50.373  		}
  50.374  	      set_buffer_internal (b);
  50.375 @@ -4212,7 +4212,7 @@
  50.376  		     an error. */
  50.377  		  if (listdesc >= 0)
  50.378  		    record_unwind_protect (do_auto_save_unwind,
  50.379 -					   make_int (listdesc));
  50.380 +					   make_fixnum (listdesc));
  50.381  		}
  50.382  
  50.383  	      /* Record all the buffers that we are auto-saving in
  50.384 @@ -4274,7 +4274,7 @@
  50.385  		continue;
  50.386  
  50.387  	      b->auto_save_modified = BUF_MODIFF (b);
  50.388 -	      b->saved_size = make_int (BUF_SIZE (b));
  50.389 +	      b->saved_size = make_fixnum (BUF_SIZE (b));
  50.390  	      EMACS_GET_TIME (after_time);
  50.391  	      /* If auto-save took more than 60 seconds,
  50.392  		 assume it was an NFS failure that got a timeout.  */
  50.393 @@ -4316,7 +4316,7 @@
  50.394         ())
  50.395  {
  50.396    current_buffer->auto_save_modified = BUF_MODIFF (current_buffer);
  50.397 -  current_buffer->saved_size = make_int (BUF_SIZE (current_buffer));
  50.398 +  current_buffer->saved_size = make_fixnum (BUF_SIZE (current_buffer));
  50.399    current_buffer->auto_save_failure_time = -1;
  50.400    return Qnil;
  50.401  }
    51.1 --- a/src/floatfns.c	Sat Oct 08 12:26:09 2011 +0100
    51.2 +++ b/src/floatfns.c	Sun Oct 09 09:51:57 2011 +0100
    51.3 @@ -132,14 +132,14 @@
    51.4  #else
    51.5    REGISTER EMACS_INT result = (EMACS_INT) x;
    51.6  
    51.7 -  if (result > EMACS_INT_MAX || result < EMACS_INT_MIN)
    51.8 +  if (result > MOST_POSITIVE_FIXNUM || result < MOST_NEGATIVE_FIXNUM)
    51.9      {
   51.10        if (!UNBOUNDP (num2))
   51.11  	range_error2 (name, num, num2);
   51.12        else
   51.13  	range_error (name, num);
   51.14      }
   51.15 -  return make_int (result);
   51.16 +  return make_fixnum (result);
   51.17  #endif /* HAVE_BIGNUM */
   51.18  }
   51.19  
   51.20 @@ -203,8 +203,8 @@
   51.21    if (FLOATP (num))
   51.22      return XFLOAT_DATA (num);
   51.23  
   51.24 -  if (INTP (num))
   51.25 -    return (double) XINT (num);
   51.26 +  if (FIXNUMP (num))
   51.27 +    return (double) XFIXNUM (num);
   51.28  
   51.29  #ifdef HAVE_BIGNUM
   51.30    if (BIGNUMP (num))
   51.31 @@ -444,26 +444,26 @@
   51.32         (number1, number2))
   51.33  {
   51.34  #ifdef HAVE_BIGNUM
   51.35 -  if (INTEGERP (number1) && INTP (number2))
   51.36 +  if (INTEGERP (number1) && FIXNUMP (number2))
   51.37      {
   51.38 -      if (INTP (number1))
   51.39 +      if (FIXNUMP (number1))
   51.40  	{
   51.41 -	  bignum_set_long (scratch_bignum2, XREALINT (number1));
   51.42 -	  bignum_pow (scratch_bignum, scratch_bignum2, XREALINT (number2));
   51.43 +	  bignum_set_long (scratch_bignum2, XREALFIXNUM (number1));
   51.44 +	  bignum_pow (scratch_bignum, scratch_bignum2, XREALFIXNUM (number2));
   51.45  	}
   51.46        else
   51.47  	bignum_pow (scratch_bignum, XBIGNUM_DATA (number1),
   51.48 -		    XREALINT (number2));
   51.49 +		    XREALFIXNUM (number2));
   51.50        return Fcanonicalize_number (make_bignum_bg (scratch_bignum));
   51.51      }
   51.52  #endif
   51.53  
   51.54 -  if (INTP (number1) && /* common lisp spec */
   51.55 -      INTP (number2)) /* don't promote, if both are ints */
   51.56 +  if (FIXNUMP (number1) && /* common lisp spec */
   51.57 +      FIXNUMP (number2)) /* don't promote, if both are ints */
   51.58      {
   51.59        EMACS_INT retval;
   51.60 -      EMACS_INT x = XINT (number1);
   51.61 -      EMACS_INT y = XINT (number2);
   51.62 +      EMACS_INT x = XFIXNUM (number1);
   51.63 +      EMACS_INT y = XFIXNUM (number2);
   51.64  
   51.65        if (y < 0)
   51.66  	{
   51.67 @@ -485,7 +485,7 @@
   51.68  	      y = (EMACS_UINT) y >> 1;
   51.69  	    }
   51.70  	}
   51.71 -      return make_int (retval);
   51.72 +      return make_fixnum (retval);
   51.73      }
   51.74  
   51.75  #if defined(HAVE_BIGFLOAT) && defined(bigfloat_pow)
   51.76 @@ -711,12 +711,12 @@
   51.77        return number;
   51.78      }
   51.79  
   51.80 -  if (INTP (number))
   51.81 +  if (FIXNUMP (number))
   51.82  #ifdef HAVE_BIGNUM
   51.83      /* The most negative Lisp fixnum will overflow */
   51.84 -    return (XINT (number) >= 0) ? number : make_integer (- XINT (number));
   51.85 +    return (XFIXNUM (number) >= 0) ? number : make_integer (- XFIXNUM (number));
   51.86  #else
   51.87 -    return (XINT (number) >= 0) ? number : make_int (- XINT (number));
   51.88 +    return (XFIXNUM (number) >= 0) ? number : make_fixnum (- XFIXNUM (number));
   51.89  #endif
   51.90  
   51.91  #ifdef HAVE_BIGNUM
   51.92 @@ -758,8 +758,8 @@
   51.93  */
   51.94         (number))
   51.95  {
   51.96 -  if (INTP (number))
   51.97 -    return make_float ((double) XINT (number));
   51.98 +  if (FIXNUMP (number))
   51.99 +    return make_float ((double) XFIXNUM (number));
  51.100  
  51.101  #ifdef HAVE_BIGNUM
  51.102    if (BIGNUMP (number))
  51.103 @@ -804,11 +804,11 @@
  51.104    double f = extract_float (number);
  51.105  
  51.106    if (f == 0.0)
  51.107 -    return make_int (EMACS_INT_MIN);
  51.108 +    return make_fixnum (MOST_NEGATIVE_FIXNUM);
  51.109  #ifdef HAVE_LOGB
  51.110    {
  51.111      Lisp_Object val;
  51.112 -    IN_FLOAT (val = make_int ((EMACS_INT) logb (f)), "logb", number);
  51.113 +    IN_FLOAT (val = make_fixnum ((EMACS_INT) logb (f)), "logb", number);
  51.114      return val;
  51.115    }
  51.116  #else
  51.117 @@ -816,7 +816,7 @@
  51.118    {
  51.119      int exqp;
  51.120      IN_FLOAT (frexp (f, &exqp), "logb", number);
  51.121 -    return make_int (exqp - 1);
  51.122 +    return make_fixnum (exqp - 1);
  51.123    }
  51.124  #else
  51.125    {
  51.126 @@ -840,7 +840,7 @@
  51.127          f /= d;
  51.128          val += i;
  51.129        }
  51.130 -    return make_int (val);
  51.131 +    return make_fixnum (val);
  51.132    }
  51.133  #endif /* ! HAVE_FREXP */
  51.134  #endif /* ! HAVE_LOGB */
  51.135 @@ -895,24 +895,24 @@
  51.136           does these conversions, we do them too for symmetry: */\
  51.137        if (CHARP (number))                                       \
  51.138          {                                                       \
  51.139 -          number = make_int (XCHAR (number));                   \
  51.140 +          number = make_fixnum (XCHAR (number));                   \
  51.141          }                                                       \
  51.142        else if (MARKERP (number))				\
  51.143          {                                                       \
  51.144 -          number = make_int (marker_position (number));         \
  51.145 +          number = make_fixnum (marker_position (number));         \
  51.146          }                                                       \
  51.147                                                                  \
  51.148        if (CHARP (divisor))                                      \
  51.149          {                                                       \
  51.150 -          divisor = make_int (XCHAR (divisor));                 \
  51.151 +          divisor = make_fixnum (XCHAR (divisor));                 \
  51.152          }                                                       \
  51.153        else if (MARKERP (divisor))				\
  51.154          {                                                       \
  51.155 -          divisor = make_int (marker_position (divisor));       \
  51.156 +          divisor = make_fixnum (marker_position (divisor));       \
  51.157          }                                                       \
  51.158                                                                  \
  51.159 -      CHECK_INT_OR_FLOAT (divisor);                             \
  51.160 -      if (INTP (number) && INTP (divisor))                      \
  51.161 +      CHECK_FIXNUM_OR_FLOAT (divisor);                             \
  51.162 +      if (FIXNUMP (number) && FIXNUMP (divisor))                      \
  51.163          {                                                       \
  51.164            return conversion##_two_fixnum (number, divisor,      \
  51.165                                          return_float);          \
  51.166 @@ -988,13 +988,13 @@
  51.167  #define MAYBE_CHAR_OR_MARKER(conversion) do {                           \
  51.168    if (CHARP (number))                                                   \
  51.169      {                                                                   \
  51.170 -      return conversion##_one_mundane_arg (make_int (XCHAR (number)),   \
  51.171 +      return conversion##_one_mundane_arg (make_fixnum (XCHAR (number)),   \
  51.172                                             divisor, return_float);      \
  51.173      }                                                                   \
  51.174                                                                          \
  51.175    if (MARKERP (number))                                                 \
  51.176      {                                                                   \
  51.177 -      return conversion##_one_mundane_arg (make_int                     \
  51.178 +      return conversion##_one_mundane_arg (make_fixnum                     \
  51.179                                             (marker_position(number)),   \
  51.180                                             divisor, return_float);      \
  51.181      }                                                                   \
  51.182 @@ -1007,8 +1007,8 @@
  51.183  ceiling_two_fixnum (Lisp_Object number, Lisp_Object divisor,
  51.184  		    int return_float)
  51.185  {
  51.186 -  EMACS_INT i1 = XREALINT (number);
  51.187 -  EMACS_INT i2 = XREALINT (divisor);
  51.188 +  EMACS_INT i1 = XREALFIXNUM (number);
  51.189 +  EMACS_INT i2 = XREALFIXNUM (divisor);
  51.190    EMACS_INT i3 = 0, i4 = 0;
  51.191  
  51.192    if (i2 == 0)
  51.193 @@ -1062,11 +1062,11 @@
  51.194  
  51.195    if (!return_float)
  51.196      {
  51.197 -      return values2 (make_int (i3), make_int (i4));
  51.198 +      return values2 (make_fixnum (i3), make_fixnum (i4));
  51.199      }
  51.200  
  51.201    return values2 (make_float ((double)i3),
  51.202 -		  make_int (i4));
  51.203 +		  make_fixnum (i4));
  51.204  }
  51.205  
  51.206  #ifdef HAVE_BIGNUM
  51.207 @@ -1160,7 +1160,7 @@
  51.208        bignum_set_bigfloat (scratch_bignum, scratch_bigfloat);
  51.209        res0 = Fcanonicalize_number (make_bignum_bg (scratch_bignum));
  51.210  #else
  51.211 -      res0 = make_int ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.212 +      res0 = make_fixnum ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.213  #endif /* HAVE_BIGNUM */
  51.214      }
  51.215  
  51.216 @@ -1220,7 +1220,7 @@
  51.217        bignum_set_bigfloat (scratch_bignum, scratch_bigfloat);
  51.218        res0 = Fcanonicalize_number (make_bignum_bg (scratch_bignum));
  51.219  #else
  51.220 -      res0 = make_int ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.221 +      res0 = make_fixnum ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.222  #endif /* HAVE_BIGNUM */
  51.223      }
  51.224  
  51.225 @@ -1288,9 +1288,9 @@
  51.226  
  51.227    if (return_float)
  51.228      {
  51.229 -      if (INTP (number))
  51.230 +      if (FIXNUMP (number))
  51.231  	{
  51.232 -	  return values2 (make_float ((double) XINT (number)), Qzero);
  51.233 +	  return values2 (make_float ((double) XFIXNUM (number)), Qzero);
  51.234  	}
  51.235  #ifdef HAVE_BIGNUM
  51.236        else if (BIGNUMP (number))
  51.237 @@ -1318,8 +1318,8 @@
  51.238  floor_two_fixnum (Lisp_Object number, Lisp_Object divisor,
  51.239  		  int return_float)
  51.240  {
  51.241 -  EMACS_INT i1 = XREALINT (number);
  51.242 -  EMACS_INT i2 = XREALINT (divisor);
  51.243 +  EMACS_INT i1 = XREALFIXNUM (number);
  51.244 +  EMACS_INT i2 = XREALFIXNUM (divisor);
  51.245    EMACS_INT i3 = 0, i4 = 0;
  51.246    Lisp_Object res0;
  51.247  
  51.248 @@ -1342,10 +1342,10 @@
  51.249      }
  51.250    else
  51.251      {
  51.252 -      res0 = make_int (i3);
  51.253 +      res0 = make_fixnum (i3);
  51.254      }
  51.255  
  51.256 -  return values2 (res0, make_int (i4));
  51.257 +  return values2 (res0, make_fixnum (i4));
  51.258  }
  51.259  
  51.260  #ifdef HAVE_BIGNUM
  51.261 @@ -1446,7 +1446,7 @@
  51.262        bignum_set_bigfloat (scratch_bignum, scratch_bigfloat);
  51.263        res0 = Fcanonicalize_number (make_bignum_bg (scratch_bignum));
  51.264  #else
  51.265 -      res0 = make_int ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.266 +      res0 = make_fixnum ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.267  #endif /* HAVE_BIGNUM */
  51.268      }
  51.269  
  51.270 @@ -1507,7 +1507,7 @@
  51.271        bignum_set_bigfloat (scratch_bignum, scratch_bigfloat);
  51.272        res0 = Fcanonicalize_number (make_bignum_bg (scratch_bignum));
  51.273  #else
  51.274 -      res0 = make_int ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.275 +      res0 = make_fixnum ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.276  #endif /* HAVE_BIGNUM */
  51.277      }
  51.278  
  51.279 @@ -1594,8 +1594,8 @@
  51.280  static Lisp_Object
  51.281  round_two_fixnum (Lisp_Object number, Lisp_Object divisor, int return_float)
  51.282  {
  51.283 -  EMACS_INT i1 = XREALINT (number);
  51.284 -  EMACS_INT i2 = XREALINT (divisor);
  51.285 +  EMACS_INT i1 = XREALFIXNUM (number);
  51.286 +  EMACS_INT i2 = XREALFIXNUM (divisor);
  51.287    EMACS_INT i0, hi2, flooring, floored, flsecond;
  51.288  
  51.289    if (i2 == 0)
  51.290 @@ -1617,13 +1617,13 @@
  51.291      {
  51.292        i0 = floored - 1;
  51.293        return values2 (return_float ? make_float ((double)i0) :
  51.294 -		      make_int (i0), make_int (hi2));
  51.295 +		      make_fixnum (i0), make_fixnum (hi2));
  51.296      }
  51.297    else
  51.298      {
  51.299        return values2 (return_float ? make_float ((double)floored) :
  51.300 -		      make_int (floored),
  51.301 -		      make_int (flsecond - hi2));
  51.302 +		      make_fixnum (floored),
  51.303 +		      make_fixnum (flsecond - hi2));
  51.304      }
  51.305  }
  51.306  
  51.307 @@ -1852,7 +1852,7 @@
  51.308        bignum_set_bigfloat (scratch_bignum, XBIGFLOAT_DATA (res0));
  51.309        res0 = Fcanonicalize_number (make_bignum_bg (scratch_bignum));
  51.310  #else
  51.311 -      res0 = make_int ((EMACS_INT) bigfloat_to_long (XBIGFLOAT_DATA (res0)));
  51.312 +      res0 = make_fixnum ((EMACS_INT) bigfloat_to_long (XBIGFLOAT_DATA (res0)));
  51.313  #endif /* HAVE_BIGNUM */
  51.314      }
  51.315  
  51.316 @@ -1904,7 +1904,7 @@
  51.317        bignum_set_bigfloat (scratch_bignum, XBIGFLOAT_DATA (res0));
  51.318        res0 = Fcanonicalize_number (make_bignum_bg (scratch_bignum));
  51.319  #else
  51.320 -      res0 = make_int ((EMACS_INT) bigfloat_to_long
  51.321 +      res0 = make_fixnum ((EMACS_INT) bigfloat_to_long
  51.322  		       (XBIGFLOAT_DATA (res0)));
  51.323  #endif /* HAVE_BIGNUM */
  51.324      }
  51.325 @@ -1994,8 +1994,8 @@
  51.326  truncate_two_fixnum (Lisp_Object number, Lisp_Object divisor,
  51.327  		     int return_float)
  51.328  {
  51.329 -  EMACS_INT i1 = XREALINT (number);
  51.330 -  EMACS_INT i2 = XREALINT (divisor);
  51.331 +  EMACS_INT i1 = XREALFIXNUM (number);
  51.332 +  EMACS_INT i2 = XREALFIXNUM (divisor);
  51.333    EMACS_INT i0;
  51.334  
  51.335    if (i2 == 0)
  51.336 @@ -2010,11 +2010,11 @@
  51.337  
  51.338    if (return_float)
  51.339      {
  51.340 -      return values2 (make_float ((double)i0), make_int (i1 - (i0 * i2)));
  51.341 +      return values2 (make_float ((double)i0), make_fixnum (i1 - (i0 * i2)));
  51.342      }
  51.343    else
  51.344      {
  51.345 -      return values2 (make_int (i0), make_int (i1 - (i0 * i2)));
  51.346 +      return values2 (make_fixnum (i0), make_fixnum (i1 - (i0 * i2)));
  51.347      }
  51.348  }
  51.349  
  51.350 @@ -2121,7 +2121,7 @@
  51.351        bignum_set_bigfloat (scratch_bignum, scratch_bigfloat);
  51.352        res0 = Fcanonicalize_number (make_bignum_bg (scratch_bignum));
  51.353  #else
  51.354 -      res0 = make_int ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.355 +      res0 = make_fixnum ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.356  #endif /* HAVE_BIGNUM */
  51.357      }
  51.358  
  51.359 @@ -2187,7 +2187,7 @@
  51.360        bignum_set_bigfloat (scratch_bignum, scratch_bigfloat);
  51.361        res0 = Fcanonicalize_number (make_bignum_bg (scratch_bignum));
  51.362  #else
  51.363 -      res0 = make_int ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.364 +      res0 = make_fixnum ((EMACS_INT) bigfloat_to_long (scratch_bigfloat));
  51.365  #endif /* HAVE_BIGNUM */
  51.366      }
  51.367  
  51.368 @@ -2232,14 +2232,14 @@
  51.369  		    number, Qunbound);
  51.370    if (return_float)
  51.371      {
  51.372 -      res0 = make_float ((double)XINT(res0));
  51.373 +      res0 = make_float ((double)XFIXNUM(res0));
  51.374        return values2 (res0, make_float ((XFLOAT_DATA (number)
  51.375  					 - XFLOAT_DATA (res0))));
  51.376      }
  51.377    else
  51.378      {
  51.379        return values2 (res0, make_float (XFLOAT_DATA (number)
  51.380 -					- XREALINT (res0)));
  51.381 +					- XREALFIXNUM (res0)));
  51.382      }
  51.383  }
  51.384  
    52.1 --- a/src/fns.c	Sat Oct 08 12:26:09 2011 +0100
    52.2 +++ b/src/fns.c	Sun Oct 09 09:51:57 2011 +0100
    52.3 @@ -106,8 +106,8 @@
    52.4    Elemcount len = bit_vector_length (v);
    52.5    Elemcount last = len;
    52.6  
    52.7 -  if (INTP (Vprint_length))
    52.8 -    last = min (len, XINT (Vprint_length));
    52.9 +  if (FIXNUMP (Vprint_length))
   52.10 +    last = min (len, XFIXNUM (Vprint_length));
   52.11    write_ascstring (printcharfun, "#*");
   52.12    for (i = 0; i < last; i++)
   52.13      {
   52.14 @@ -621,7 +621,7 @@
   52.15      {
   52.16      force_eq_check:
   52.17        FROB (eq, 0);
   52.18 -      else FROB (equal, (SYMBOLP (item) || INTP (item) || CHARP (item)));
   52.19 +      else FROB (equal, (SYMBOLP (item) || FIXNUMP (item) || CHARP (item)));
   52.20        else FROB (equalp, (SYMBOLP (item)));
   52.21        else if (EQ (test, XSYMBOL_FUNCTION (Qstring_match)))
   52.22  	{
   52.23 @@ -824,15 +824,15 @@
   52.24  	 it's possible to get a quotient larger than limit; discarding
   52.25  	 these values eliminates the bias that would otherwise appear
   52.26  	 when using a large limit.  */
   52.27 -      denominator = ((unsigned long)1 << INT_VALBITS) / XINT (limit);
   52.28 +      denominator = ((unsigned long)1 << FIXNUM_VALBITS) / XFIXNUM (limit);
   52.29        do
   52.30  	val = get_random () / denominator;
   52.31 -      while (val >= XINT (limit));
   52.32 +      while (val >= XFIXNUM (limit));
   52.33      }
   52.34    else
   52.35      val = get_random ();
   52.36  
   52.37 -  return make_int (val);
   52.38 +  return make_fixnum (val);
   52.39  }
   52.40  
   52.41  /* Random data-structure functions */
   52.42 @@ -854,19 +854,19 @@
   52.43  {
   52.44   retry:
   52.45    if (STRINGP (sequence))
   52.46 -    return make_int (string_char_length (sequence));
   52.47 +    return make_fixnum (string_char_length (sequence));
   52.48    else if (CONSP (sequence))
   52.49      {
   52.50        Elemcount len;
   52.51        GET_EXTERNAL_LIST_LENGTH (sequence, len);
   52.52 -      return make_int (len);
   52.53 +      return make_fixnum (len);
   52.54      }
   52.55    else if (VECTORP (sequence))
   52.56 -    return make_int (XVECTOR_LENGTH (sequence));
   52.57 +    return make_fixnum (XVECTOR_LENGTH (sequence));
   52.58    else if (NILP (sequence))
   52.59      return Qzero;
   52.60    else if (BIT_VECTORP (sequence))
   52.61 -    return make_int (bit_vector_length (XBIT_VECTOR (sequence)));
   52.62 +    return make_fixnum (bit_vector_length (XBIT_VECTOR (sequence)));
   52.63    else
   52.64      {
   52.65        check_losing_bytecode ("length", sequence);
   52.66 @@ -894,7 +894,7 @@
   52.67  	tortoise = XCDR (tortoise);
   52.68      }
   52.69  
   52.70 -  return make_int (len);
   52.71 +  return make_fixnum (len);
   52.72  }
   52.73  
   52.74  /* This is almost the above, but is defined by Common Lisp. We need it in C
   52.75 @@ -923,7 +923,7 @@
   52.76        signal_malformed_list_error (list);
   52.77      }
   52.78  
   52.79 -  return EQ (hare, tortoise) && len != 0 ? Qnil : make_int (len);
   52.80 +  return EQ (hare, tortoise) && len != 0 ? Qnil : make_fixnum (len);
   52.81  }
   52.82  
   52.83  static Lisp_Object string_count_from_end (Lisp_Object, Lisp_Object ,
   52.84 @@ -945,8 +945,8 @@
   52.85  		 Lisp_Object caller)
   52.86  {
   52.87    Lisp_Object item = args[0], sequence = args[1];
   52.88 -  Elemcount starting = 0, ending = EMACS_INT_MAX, encountered = 0;
   52.89 -  Elemcount len, ii = 0, counting = EMACS_INT_MAX;
   52.90 +  Elemcount starting = 0, ending = MOST_POSITIVE_FIXNUM, encountered = 0;
   52.91 +  Elemcount len, ii = 0, counting = MOST_POSITIVE_FIXNUM;
   52.92    Boolint test_not_unboundp = 1;
   52.93    check_test_func_t check_test = NULL;
   52.94  
   52.95 @@ -956,18 +956,18 @@
   52.96  
   52.97    CHECK_SEQUENCE (sequence);
   52.98    CHECK_NATNUM (start);
   52.99 -  starting = BIGNUMP (start) ? 1 + EMACS_INT_MAX : XINT (start);
  52.100 +  starting = BIGNUMP (start) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (start);
  52.101  
  52.102    if (!NILP (end))
  52.103      {
  52.104        CHECK_NATNUM (end);
  52.105 -      ending = BIGNUMP (end) ? 1 + EMACS_INT_MAX : XINT (end);
  52.106 +      ending = BIGNUMP (end) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (end);
  52.107      }
  52.108  
  52.109    if (!NILP (count))
  52.110      {
  52.111        CHECK_INTEGER (count);
  52.112 -      counting = BIGNUMP (count) ? EMACS_INT_MAX + 1 : XINT (count);
  52.113 +      counting = BIGNUMP (count) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (count);
  52.114  
  52.115        /* Our callers should have filtered out non-positive COUNT. */
  52.116        assert (counting >= 0);
  52.117 @@ -1004,7 +1004,7 @@
  52.118           it). */
  52.119        if (!NILP (count) && !NILP (from_end))
  52.120          {
  52.121 -          counting = EMACS_INT_MAX;
  52.122 +          counting = MOST_POSITIVE_FIXNUM;
  52.123          }
  52.124  
  52.125        {
  52.126 @@ -1089,8 +1089,8 @@
  52.127      {
  52.128        Lisp_Object object = Qnil;
  52.129  
  52.130 -      len = XINT (Flength (sequence));
  52.131 -      check_sequence_range (sequence, start, end, make_int (len));
  52.132 +      len = XFIXNUM (Flength (sequence));
  52.133 +      check_sequence_range (sequence, start, end, make_fixnum (len));
  52.134  
  52.135        ending = min (ending, len);
  52.136        if (0 == len)
  52.137 @@ -1103,7 +1103,7 @@
  52.138  	{
  52.139  	  for (ii = starting; ii < ending && encountered < counting; ii++)
  52.140  	    {
  52.141 -	      object = Faref (sequence, make_int (ii));
  52.142 +	      object = Faref (sequence, make_fixnum (ii));
  52.143  	      if (check_test (test, key, item, object) == test_not_unboundp)
  52.144  		{
  52.145  		  encountered++;
  52.146 @@ -1114,7 +1114,7 @@
  52.147  	{
  52.148  	  for (ii = ending - 1; ii >= starting && encountered < counting; ii--)
  52.149  	    {
  52.150 -	      object = Faref (sequence, make_int (ii));
  52.151 +	      object = Faref (sequence, make_fixnum (ii));
  52.152  	      if (check_test (test, key, item, object) == test_not_unboundp)
  52.153  		{
  52.154  		  encountered++;
  52.155 @@ -1132,8 +1132,8 @@
  52.156                       Lisp_Object test, Lisp_Object key,
  52.157                       Lisp_Object start, Lisp_Object end)
  52.158  {
  52.159 -  Elemcount length = XINT (Flength (sequence)), ii = 0, starting = XINT (start);
  52.160 -  Elemcount ending = NILP (end) ? length : XINT (end), encountered = 0;
  52.161 +  Elemcount length = XFIXNUM (Flength (sequence)), ii = 0, starting = XFIXNUM (start);
  52.162 +  Elemcount ending = NILP (end) ? length : XFIXNUM (end), encountered = 0;
  52.163    Lisp_Object *storage;
  52.164    struct gcpro gcpro1;
  52.165  
  52.166 @@ -1176,7 +1176,7 @@
  52.167                         Lisp_Object start, Lisp_Object end)
  52.168  {
  52.169    Elemcount length = string_char_length (sequence), ii = 0;
  52.170 -  Elemcount starting = XINT (start), ending = NILP (end) ? length : XINT (end);
  52.171 +  Elemcount starting = XFIXNUM (start), ending = NILP (end) ? length : XFIXNUM (end);
  52.172    Elemcount encountered = 0;
  52.173    Ibyte *cursor = XSTRING_DATA (sequence);
  52.174    Ibyte *endp = cursor + XSTRING_LENGTH (sequence);
  52.175 @@ -1308,9 +1308,9 @@
  52.176    if (!res)
  52.177      return Qt;
  52.178    else if (res > 0)
  52.179 -    return make_int (1 + matching);
  52.180 +    return make_fixnum (1 + matching);
  52.181    else
  52.182 -    return make_int (-1 - matching);
  52.183 +    return make_fixnum (-1 - matching);
  52.184  }
  52.185  
  52.186  DEFUN ("string-lessp", Fstring_lessp, 2, 2, 0, /*
  52.187 @@ -1385,7 +1385,7 @@
  52.188         (string))
  52.189  {
  52.190    CHECK_STRING (string);
  52.191 -  if (CONSP (XSTRING_PLIST (string)) && INTP (XCAR (XSTRING_PLIST (string))))
  52.192 +  if (CONSP (XSTRING_PLIST (string)) && FIXNUMP (XCAR (XSTRING_PLIST (string))))
  52.193      return XCAR (XSTRING_PLIST (string));
  52.194    else
  52.195      return Qzero;
  52.196 @@ -1403,10 +1403,10 @@
  52.197    /* skip over extent info if it's there */
  52.198    if (CONSP (*ptr) && EXTENT_INFOP (XCAR (*ptr)))
  52.199      ptr = &XCDR (*ptr);
  52.200 -  if (CONSP (*ptr) && INTP (XCAR (*ptr)))
  52.201 -    XCAR (*ptr) = make_int (1+XINT (XCAR (*ptr)));
  52.202 +  if (CONSP (*ptr) && FIXNUMP (XCAR (*ptr)))
  52.203 +    XCAR (*ptr) = make_fixnum (1+XFIXNUM (XCAR (*ptr)));
  52.204    else
  52.205 -    *ptr = Fcons (make_int (1), *ptr);
  52.206 +    *ptr = Fcons (make_fixnum (1), *ptr);
  52.207  }
  52.208  
  52.209  
  52.210 @@ -1630,7 +1630,7 @@
  52.211        else if (VECTORP (seq) || STRINGP (seq) || BIT_VECTORP (seq))
  52.212          ;
  52.213  #if 0				/* removed for XEmacs 21 */
  52.214 -      else if (INTP (seq))
  52.215 +      else if (FIXNUMP (seq))
  52.216          /* This is too revolting to think about but maintains
  52.217             compatibility with FSF (and lots and lots of old code). */
  52.218          args[argnum] = Fnumber_to_string (seq);
  52.219 @@ -1658,7 +1658,7 @@
  52.220  
  52.221      for (argnum = 0, total_length = 0; argnum < nargs; argnum++)
  52.222        {
  52.223 -        Charcount thislen = XINT (Flength (args[argnum]));
  52.224 +        Charcount thislen = XFIXNUM (Flength (args[argnum]));
  52.225          total_length += thislen;
  52.226        }
  52.227  
  52.228 @@ -1671,7 +1671,7 @@
  52.229  	    /* In append, if all but last arg are nil, return last arg */
  52.230  	    RETURN_UNGCPRO (last_tail);
  52.231  	  }
  52.232 -        val = Fmake_list (make_int (total_length), Qnil);
  52.233 +        val = Fmake_list (make_fixnum (total_length), Qnil);
  52.234          break;
  52.235        case c_vector:
  52.236          val = make_vector (total_length, Qnil);
  52.237 @@ -1719,7 +1719,7 @@
  52.238  
  52.239        if (!CONSP (seq))
  52.240  	{
  52.241 -	  thisleni = XINT (Flength (seq));
  52.242 +	  thisleni = XFIXNUM (Flength (seq));
  52.243  	}
  52.244        if (STRINGP (seq))
  52.245  	string_source_ptr = XSTRING_DATA (seq);
  52.246 @@ -1751,10 +1751,10 @@
  52.247  	      else if (VECTORP (seq))
  52.248                  elt = XVECTOR_DATA (seq)[thisindex];
  52.249  	      else if (BIT_VECTORP (seq))
  52.250 -		elt = make_int (bit_vector_bit (XBIT_VECTOR (seq),
  52.251 +		elt = make_fixnum (bit_vector_bit (XBIT_VECTOR (seq),
  52.252  						thisindex));
  52.253                else
  52.254 -		elt = Felt (seq, make_int (thisindex));
  52.255 +		elt = Felt (seq, make_fixnum (thisindex));
  52.256                thisindex++;
  52.257  	    }
  52.258  
  52.259 @@ -1771,7 +1771,7 @@
  52.260  	  else if (BIT_VECTORP (val))
  52.261  	    {
  52.262  	      CHECK_BIT (elt);
  52.263 -	      set_bit_vector_bit (XBIT_VECTOR (val), toindex++, XINT (elt));
  52.264 +	      set_bit_vector_bit (XBIT_VECTOR (val), toindex++, XFIXNUM (elt));
  52.265  	    }
  52.266  	  else
  52.267  	    {
  52.268 @@ -1900,17 +1900,17 @@
  52.269  */
  52.270         (sequence, start, end))
  52.271  {
  52.272 -  Elemcount len, ss, ee = EMACS_INT_MAX, ii;
  52.273 +  Elemcount len, ss, ee = MOST_POSITIVE_FIXNUM, ii;
  52.274    Lisp_Object result = Qnil;
  52.275  
  52.276    CHECK_SEQUENCE (sequence);
  52.277 -  CHECK_INT (start);
  52.278 -  ss = XINT (start);
  52.279 +  CHECK_FIXNUM (start);
  52.280 +  ss = XFIXNUM (start);
  52.281  
  52.282    if (!NILP (end))
  52.283      {
  52.284 -      CHECK_INT (end);
  52.285 -      ee = XINT (end);
  52.286 +      CHECK_FIXNUM (end);
  52.287 +      ee = XFIXNUM (end);
  52.288      }
  52.289  
  52.290    if (STRINGP (sequence))
  52.291 @@ -1932,7 +1932,7 @@
  52.292  
  52.293        if (ss < 0 || ee < 0)
  52.294          {
  52.295 -          len = XINT (Flength (sequence));
  52.296 +          len = XFIXNUM (Flength (sequence));
  52.297  	  if (ss < 0)
  52.298  	    {
  52.299  	      ss = len + ss;
  52.300 @@ -1952,7 +1952,7 @@
  52.301  
  52.302        if (0 != ss)
  52.303          {
  52.304 -          sequence = Fnthcdr (make_int (ss), sequence);
  52.305 +          sequence = Fnthcdr (make_fixnum (ss), sequence);
  52.306          }
  52.307  
  52.308        ii = ss + 1;
  52.309 @@ -1989,7 +1989,7 @@
  52.310      }
  52.311    else
  52.312      {
  52.313 -      len = XINT (Flength (sequence));
  52.314 +      len = XFIXNUM (Flength (sequence));
  52.315        if (ss < 0)
  52.316  	{
  52.317  	  ss = len + ss;
  52.318 @@ -2006,7 +2006,7 @@
  52.319  	  ee = min (len, ee);
  52.320  	}
  52.321  
  52.322 -      check_sequence_range (sequence, start, end, make_int (len));
  52.323 +      check_sequence_range (sequence, start, end, make_fixnum (len));
  52.324  
  52.325        if (VECTORP (sequence))
  52.326          {
  52.327 @@ -2260,7 +2260,7 @@
  52.328    REGISTER EMACS_INT i;
  52.329    REGISTER Lisp_Object tail = list;
  52.330    CHECK_NATNUM (n);
  52.331 -  for (i = BIGNUMP (n) ? 1 + EMACS_INT_MAX : XINT (n); i; i--)
  52.332 +  for (i = BIGNUMP (n) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (n); i; i--)
  52.333      {
  52.334        if (CONSP (tail))
  52.335  	tail = XCDR (tail);
  52.336 @@ -2292,7 +2292,7 @@
  52.337  {
  52.338    /* This function can GC */
  52.339   retry:
  52.340 -  CHECK_INT_COERCE_CHAR (n); /* yuck! */
  52.341 +  CHECK_FIXNUM_COERCE_CHAR (n); /* yuck! */
  52.342    if (LISTP (sequence))
  52.343      {
  52.344        Lisp_Object tem = Fnthcdr (n, sequence);
  52.345 @@ -2342,7 +2342,7 @@
  52.346    else
  52.347      {
  52.348        CHECK_NATNUM (n);
  52.349 -      int_n = BIGNUMP (n) ? 1 + EMACS_INT_MAX : XINT (n);
  52.350 +      int_n = BIGNUMP (n) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (n);
  52.351      }
  52.352  
  52.353    for (retval = tortoise = hare = list, count = 0;
  52.354 @@ -2377,7 +2377,7 @@
  52.355    if (!NILP (n))
  52.356      {
  52.357        CHECK_NATNUM (n);
  52.358 -      int_n = BIGNUMP (n) ? 1 + EMACS_INT_MAX : XINT (n);
  52.359 +      int_n = BIGNUMP (n) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (n);
  52.360      }
  52.361  
  52.362    if (CONSP (list))
  52.363 @@ -2425,7 +2425,7 @@
  52.364    if (!NILP (n))
  52.365      {
  52.366        CHECK_NATNUM (n);
  52.367 -      int_n = BIGNUMP (n) ? 1 + EMACS_INT_MAX : XINT (n);
  52.368 +      int_n = BIGNUMP (n) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (n);
  52.369      }
  52.370  
  52.371    if (CONSP (list))
  52.372 @@ -2517,8 +2517,8 @@
  52.373  {
  52.374    struct gcpro gcpro1;
  52.375    Lisp_Object tail_before = Qnil;
  52.376 -  Elemcount ii = 0, starting = XINT (start);
  52.377 -  Elemcount ending = NILP (end) ? EMACS_INT_MAX : XINT (end);
  52.378 +  Elemcount ii = 0, starting = XFIXNUM (start);
  52.379 +  Elemcount ending = NILP (end) ? MOST_POSITIVE_FIXNUM : XFIXNUM (end);
  52.380  
  52.381    GCPRO1 (tail_before);
  52.382  
  52.383 @@ -2882,16 +2882,16 @@
  52.384            Lisp_Object from_end, Lisp_Object default_, Lisp_Object caller)
  52.385  {
  52.386    Lisp_Object result = Qnil;
  52.387 -  Elemcount starting = 0, ending = EMACS_INT_MAX, len, ii = 0;
  52.388 +  Elemcount starting = 0, ending = MOST_POSITIVE_FIXNUM, len, ii = 0;
  52.389  
  52.390    CHECK_SEQUENCE (sequence);
  52.391    CHECK_NATNUM (start);
  52.392 -  starting = INTP (start) ? XINT (start) : 1 + EMACS_INT_MAX;
  52.393 +  starting = FIXNUMP (start) ? XFIXNUM (start) : 1 + MOST_POSITIVE_FIXNUM;
  52.394  
  52.395    if (!NILP (end))
  52.396      {
  52.397        CHECK_NATNUM (end);
  52.398 -      ending = INTP (end) ? XINT (end) : 1 + EMACS_INT_MAX;
  52.399 +      ending = FIXNUMP (end) ? XFIXNUM (end) : 1 + MOST_POSITIVE_FIXNUM;
  52.400      }
  52.401  
  52.402    *object_out = default_;
  52.403 @@ -2981,8 +2981,8 @@
  52.404    else
  52.405      {
  52.406        Lisp_Object object = Qnil;
  52.407 -      len = XINT (Flength (sequence));
  52.408 -      check_sequence_range (sequence, start, end, make_int (len));
  52.409 +      len = XFIXNUM (Flength (sequence));
  52.410 +      check_sequence_range (sequence, start, end, make_fixnum (len));
  52.411  
  52.412        ending = min (ending, len);
  52.413        if (0 == len)
  52.414 @@ -2995,7 +2995,7 @@
  52.415  	{
  52.416  	  for (ii = starting; ii < ending; ii++)
  52.417  	    {
  52.418 -	      object = Faref (sequence, make_int (ii));
  52.419 +	      object = Faref (sequence, make_fixnum (ii));
  52.420  	      if (check_test (test, key, item, object) == test_not_unboundp)
  52.421  		{
  52.422  		  result = make_integer (ii);
  52.423 @@ -3008,7 +3008,7 @@
  52.424  	{
  52.425  	  for (ii = ending - 1; ii >= starting; ii--)
  52.426  	    {
  52.427 -	      object = Faref (sequence, make_int (ii));
  52.428 +	      object = Faref (sequence, make_fixnum (ii));
  52.429  	      if (check_test (test, key, item, object) == test_not_unboundp)
  52.430  		{
  52.431  		  result = make_integer (ii);
  52.432 @@ -3138,7 +3138,7 @@
  52.433         (int nargs, Lisp_Object *args))
  52.434  {
  52.435    Lisp_Object item = args[0], sequence = args[1];
  52.436 -  Elemcount starting = 0, ending = EMACS_INT_MAX, counting = EMACS_INT_MAX;
  52.437 +  Elemcount starting = 0, ending = MOST_POSITIVE_FIXNUM, counting = MOST_POSITIVE_FIXNUM;
  52.438    Elemcount len, ii = 0, encountered = 0, presenting = 0;
  52.439    Boolint test_not_unboundp = 1;
  52.440    check_test_func_t check_test = NULL;
  52.441 @@ -3149,12 +3149,12 @@
  52.442  
  52.443    CHECK_SEQUENCE (sequence);
  52.444    CHECK_NATNUM (start);
  52.445 -  starting = BIGNUMP (start) ? 1 + EMACS_INT_MAX : XINT (start);
  52.446 +  starting = BIGNUMP (start) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (start);
  52.447  
  52.448    if (!NILP (end))
  52.449      {
  52.450        CHECK_NATNUM (end);
  52.451 -      ending = BIGNUMP (end) ? 1 + EMACS_INT_MAX : XINT (end);
  52.452 +      ending = BIGNUMP (end) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (end);
  52.453      }
  52.454  
  52.455    if (!UNBOUNDP (count))
  52.456 @@ -3162,15 +3162,15 @@
  52.457        if (!NILP (count))
  52.458  	{
  52.459  	  CHECK_INTEGER (count);
  52.460 -          if (INTP (count))
  52.461 -            {
  52.462 -              counting = XINT (count);
  52.463 +          if (FIXNUMP (count))
  52.464 +            {
  52.465 +              counting = XFIXNUM (count);
  52.466              }
  52.467  #ifdef HAVE_BIGNUM
  52.468            else
  52.469              {
  52.470                counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ?
  52.471 -                1 + EMACS_INT_MAX : EMACS_INT_MIN - 1;
  52.472 +                1 + MOST_POSITIVE_FIXNUM : MOST_NEGATIVE_FIXNUM - 1;
  52.473              }
  52.474  #endif
  52.475  
  52.476 @@ -3220,7 +3220,7 @@
  52.477  	      return sequence;
  52.478  	    }
  52.479  
  52.480 -	  presenting = XINT (present);
  52.481 +	  presenting = XFIXNUM (present);
  52.482  
  52.483  	  /* If there are fewer items in the list than we have permission to
  52.484  	     delete, we don't need to differentiate between the :from-end
  52.485 @@ -3274,7 +3274,7 @@
  52.486  	  !(presenting ? encountered == presenting : encountered == counting)) 
  52.487  	{
  52.488  	  check_sequence_range (args[1], start, end,
  52.489 -                                make_int (deleted + XINT (Flength (args[1]))));
  52.490 +                                make_fixnum (deleted + XFIXNUM (Flength (args[1]))));
  52.491  	}
  52.492  
  52.493        return sequence;
  52.494 @@ -3297,7 +3297,7 @@
  52.495  	      return sequence;
  52.496  	    }
  52.497  
  52.498 -	  presenting = XINT (present);
  52.499 +	  presenting = XFIXNUM (present);
  52.500  
  52.501  	  /* If there are fewer items in the list than we have permission to
  52.502  	     delete, we don't need to differentiate between the :from-end
  52.503 @@ -3366,9 +3366,9 @@
  52.504        Lisp_Object *staging = NULL, *staging_cursor, *staging_limit;
  52.505        Elemcount positioning;
  52.506  
  52.507 -      len = XINT (Flength (sequence));
  52.508 -
  52.509 -      check_sequence_range (sequence, start, end, make_int (len));
  52.510 +      len = XFIXNUM (Flength (sequence));
  52.511 +
  52.512 +      check_sequence_range (sequence, start, end, make_fixnum (len));
  52.513  
  52.514        position0 = position (&object, item, sequence, check_test,
  52.515                              test_not_unboundp, test, key, start, end,
  52.516 @@ -3379,7 +3379,7 @@
  52.517  	}
  52.518  
  52.519        ending = min (ending, len);
  52.520 -      positioning = XINT (position0);
  52.521 +      positioning = XFIXNUM (position0);
  52.522        encountered = 1;
  52.523  
  52.524        if (NILP (from_end))
  52.525 @@ -3390,14 +3390,14 @@
  52.526  	  ii = 0;
  52.527  	  while (ii < positioning)
  52.528  	    {
  52.529 -	      *staging_cursor++ = Faref (sequence, make_int (ii));
  52.530 +	      *staging_cursor++ = Faref (sequence, make_fixnum (ii));
  52.531  	      ii++;
  52.532  	    }
  52.533  
  52.534  	  ii = positioning + 1;
  52.535  	  while (ii < ending)
  52.536  	    {
  52.537 -	      object = Faref (sequence, make_int (ii));
  52.538 +	      object = Faref (sequence, make_fixnum (ii));
  52.539  	      if (encountered < counting
  52.540  		  && (check_test (test, key, item, object)
  52.541  		      == test_not_unboundp))
  52.542 @@ -3413,7 +3413,7 @@
  52.543  
  52.544  	  while (ii < len)
  52.545  	    {
  52.546 -	      *staging_cursor++ = Faref (sequence, make_int (ii));
  52.547 +	      *staging_cursor++ = Faref (sequence, make_fixnum (ii));
  52.548  	      ii++;
  52.549  	    }
  52.550  	}
  52.551 @@ -3425,14 +3425,14 @@
  52.552  	  ii = len - 1;
  52.553  	  while (ii > positioning)
  52.554  	    {
  52.555 -	      *--staging_cursor = Faref (sequence, make_int (ii));
  52.556 +	      *--staging_cursor = Faref (sequence, make_fixnum (ii));
  52.557  	      ii--;
  52.558  	    }
  52.559  
  52.560  	  ii = positioning - 1;
  52.561  	  while (ii >= starting)
  52.562  	    {
  52.563 -	      object = Faref (sequence, make_int (ii));
  52.564 +	      object = Faref (sequence, make_fixnum (ii));
  52.565  	      if (encountered < counting
  52.566  		  && (check_test (test, key, item, object) ==
  52.567  		      test_not_unboundp))
  52.568 @@ -3449,7 +3449,7 @@
  52.569  
  52.570  	  while (ii >= 0)
  52.571  	    {
  52.572 -	      *--staging_cursor = Faref (sequence, make_int (ii));
  52.573 +	      *--staging_cursor = Faref (sequence, make_fixnum (ii));
  52.574  	      ii--;
  52.575  	    }
  52.576  
  52.577 @@ -3502,7 +3502,7 @@
  52.578  {
  52.579    Lisp_Object item = args[0], sequence = args[1], matched_count = Qnil,
  52.580      tail = Qnil;
  52.581 -  Elemcount starting = 0, ending = EMACS_INT_MAX, counting = EMACS_INT_MAX;
  52.582 +  Elemcount starting = 0, ending = MOST_POSITIVE_FIXNUM, counting = MOST_POSITIVE_FIXNUM;
  52.583    Elemcount ii = 0, encountered = 0, presenting = 0;
  52.584    Boolint test_not_unboundp = 1;
  52.585    check_test_func_t check_test = NULL;
  52.586 @@ -3517,26 +3517,26 @@
  52.587      }
  52.588  
  52.589    CHECK_NATNUM (start);
  52.590 -  starting = BIGNUMP (start) ? 1 + EMACS_INT_MAX : XINT (start);
  52.591 +  starting = BIGNUMP (start) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (start);
  52.592  
  52.593    if (!NILP (end))
  52.594      {
  52.595        CHECK_NATNUM (end);
  52.596 -      ending = BIGNUMP (end) ? 1 + EMACS_INT_MAX : XINT (end);
  52.597 +      ending = BIGNUMP (end) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (end);
  52.598      }
  52.599  
  52.600    if (!NILP (count))
  52.601      {
  52.602        CHECK_INTEGER (count);
  52.603 -      if (INTP (count))
  52.604 -        {
  52.605 -          counting = XINT (count);
  52.606 +      if (FIXNUMP (count))
  52.607 +        {
  52.608 +          counting = XFIXNUM (count);
  52.609          }
  52.610  #ifdef HAVE_BIGNUM
  52.611        else
  52.612          {
  52.613            counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ?
  52.614 -            1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN;
  52.615 +            1 + MOST_POSITIVE_FIXNUM : -1 + MOST_NEGATIVE_FIXNUM;
  52.616          }
  52.617  #endif
  52.618  
  52.619 @@ -3576,7 +3576,7 @@
  52.620  
  52.621        if (!NILP (count) && !NILP (from_end))
  52.622  	{
  52.623 -	  presenting = XINT (matched_count);
  52.624 +	  presenting = XFIXNUM (matched_count);
  52.625  
  52.626  	  /* If there are fewer matching elements in the list than we have
  52.627  	     permission to delete, we don't need to differentiate between
  52.628 @@ -3749,8 +3749,8 @@
  52.629  {
  52.630    Lisp_Object checking = Qnil, result = list;
  52.631    Lisp_Object keyed, positioned, position_cons = Qnil, result_tail;
  52.632 -  Elemcount len = XINT (Flength (list)), pos, starting = XINT (start);
  52.633 -  Elemcount ending = (NILP (end) ? len : XINT (end)), greatest_pos_seen = -1;
  52.634 +  Elemcount len = XFIXNUM (Flength (list)), pos, starting = XFIXNUM (start);
  52.635 +  Elemcount ending = (NILP (end) ? len : XFIXNUM (end)), greatest_pos_seen = -1;
  52.636    Elemcount ii = 0;
  52.637    struct gcpro gcpro1;
  52.638  
  52.639 @@ -3788,10 +3788,10 @@
  52.640          while (!NILP ((positioned = list_position_cons_before
  52.641                         (&position_cons, keyed, checking, check_test,
  52.642                          test_not_unboundp, test, key, 0,
  52.643 -                        make_int (max (starting - pos, 0)),
  52.644 -                        make_int (ending - pos)))))
  52.645 +                        make_fixnum (max (starting - pos, 0)),
  52.646 +                        make_fixnum (ending - pos)))))
  52.647            {
  52.648 -            pos = XINT (positioned) + pos;
  52.649 +            pos = XFIXNUM (positioned) + pos;
  52.650              set_bit_vector_bit (deleting, pos, 1);
  52.651              greatest_pos_seen = max (greatest_pos_seen, pos);
  52.652              checking = NILP (position_cons) ?
  52.653 @@ -3864,7 +3864,7 @@
  52.654  {
  52.655    Lisp_Object sequence = args[0], keyed = Qnil;
  52.656    Lisp_Object positioned = Qnil, ignore = Qnil;
  52.657 -  Elemcount starting = 0, ending = EMACS_INT_MAX, len, ii = 0, jj = 0;
  52.658 +  Elemcount starting = 0, ending = MOST_POSITIVE_FIXNUM, len, ii = 0, jj = 0;
  52.659    Boolint test_not_unboundp = 1;
  52.660    check_test_func_t check_test = NULL;
  52.661    struct gcpro gcpro1, gcpro2;
  52.662 @@ -3875,12 +3875,12 @@
  52.663  
  52.664    CHECK_SEQUENCE (sequence);
  52.665    CHECK_NATNUM (start);
  52.666 -  starting = BIGNUMP (start) ? 1 + EMACS_INT_MAX : XINT (start);
  52.667 +  starting = BIGNUMP (start) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (start);
  52.668  
  52.669    if (!NILP (end))
  52.670      {
  52.671        CHECK_NATNUM (end);
  52.672 -      ending = BIGNUMP (end) ? 1 + EMACS_INT_MAX : XINT (end);
  52.673 +      ending = BIGNUMP (end) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (end);
  52.674      }
  52.675  
  52.676    CHECK_KEY_ARGUMENT (key);
  52.677 @@ -3907,10 +3907,10 @@
  52.678                        = list_position_cons_before (&ignore, keyed,
  52.679                                                     XCDR (tail), check_test,
  52.680                                                     test_not_unboundp, test, key,
  52.681 -                                                   0, make_int (max (starting
  52.682 +                                                   0, make_fixnum (max (starting
  52.683                                                                       - (ii + 1),
  52.684                                                                       0)),
  52.685 -                                                   make_int (ending
  52.686 +                                                   make_fixnum (ending
  52.687                                                               - (ii + 1)));
  52.688                      if (!NILP (positioned))
  52.689                        {
  52.690 @@ -3946,9 +3946,9 @@
  52.691                    = list_position_cons_before (&ignore, keyed, XCDR (tail),
  52.692                                                 check_test, test_not_unboundp,
  52.693                                                 test, key, 0,
  52.694 -                                               make_int (max (starting
  52.695 +                                               make_fixnum (max (starting
  52.696                                                                - (ii + 1), 0)),
  52.697 -                                               make_int (ending - (ii + 1)));
  52.698 +                                               make_fixnum (ending - (ii + 1)));
  52.699                  if (!NILP (positioned))
  52.700                    {
  52.701                      /* We know this isn't the first iteration of the loop,
  52.702 @@ -3978,8 +3978,8 @@
  52.703  	  if ((ii < starting || (ii < ending && !NILP (end))))
  52.704  	    {
  52.705  	      check_sequence_range (args[0], start, end,
  52.706 -                                    make_int (deleted
  52.707 -                                              + XINT (Flength (args[0]))));
  52.708 +                                    make_fixnum (deleted
  52.709 +                                              + XFIXNUM (Flength (args[0]))));
  52.710  	    }
  52.711  	}
  52.712        else
  52.713 @@ -4282,12 +4282,12 @@
  52.714  	{
  52.715  	  for (ii = starting; ii < ending; ii++)
  52.716  	    {
  52.717 -	      elt = KEY (key, make_int (bit_vector_bit (bv, ii)));
  52.718 +	      elt = KEY (key, make_fixnum (bit_vector_bit (bv, ii)));
  52.719  
  52.720  	      for (jj = ii + 1; jj < ending; jj++)
  52.721  		{
  52.722  		  if (check_test (test, key, elt,
  52.723 -				  make_int (bit_vector_bit (bv, jj)))
  52.724 +				  make_fixnum (bit_vector_bit (bv, jj)))
  52.725  		      == test_not_unboundp)
  52.726  		    {
  52.727  		      set_bit_vector_bit (deleting, ii, 1);
  52.728 @@ -4301,12 +4301,12 @@
  52.729  	{
  52.730  	  for (ii = ending - 1; ii >= starting; ii--)
  52.731  	    {
  52.732 -	      elt = KEY (key, make_int (bit_vector_bit (bv, ii)));
  52.733 +	      elt = KEY (key, make_fixnum (bit_vector_bit (bv, ii)));
  52.734  
  52.735  	      for (jj = ii - 1; jj >= starting; jj--)
  52.736  		{
  52.737  		  if (check_test (test, key, elt,
  52.738 -				  make_int (bit_vector_bit (bv, jj)))
  52.739 +				  make_fixnum (bit_vector_bit (bv, jj)))
  52.740  		      == test_not_unboundp)
  52.741  		    {
  52.742  		      set_bit_vector_bit (deleting, ii, 1);
  52.743 @@ -4355,7 +4355,7 @@
  52.744    Lisp_Object sequence = args[0], keyed, positioned = Qnil;
  52.745    Lisp_Object result = sequence, result_tail = result, cursor = Qnil;
  52.746    Lisp_Object cons_with_shared_tail = Qnil;
  52.747 -  Elemcount starting = 0, ending = EMACS_INT_MAX, ii = 0;
  52.748 +  Elemcount starting = 0, ending = MOST_POSITIVE_FIXNUM, ii = 0;
  52.749    Boolint test_not_unboundp = 1;
  52.750    check_test_func_t check_test = NULL;
  52.751    struct gcpro gcpro1, gcpro2;
  52.752 @@ -4372,12 +4372,12 @@
  52.753      }
  52.754  
  52.755    CHECK_NATNUM (start);
  52.756 -  starting = BIGNUMP (start) ? 1 + EMACS_INT_MAX : XINT (start);
  52.757 +  starting = BIGNUMP (start) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (start);
  52.758  
  52.759    if (!NILP (end))
  52.760      {
  52.761        CHECK_NATNUM (end);
  52.762 -      ending = BIGNUMP (end) ? 1 + EMACS_INT_MAX : XINT (end);
  52.763 +      ending = BIGNUMP (end) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (end);
  52.764      }
  52.765  
  52.766    if (NILP (key))
  52.767 @@ -4404,9 +4404,9 @@
  52.768                    = list_position_cons_before (&ignore, keyed, XCDR (tail),
  52.769                                                 check_test, test_not_unboundp,
  52.770                                                 test, key, 0,
  52.771 -                                               make_int (max (starting
  52.772 +                                               make_fixnum (max (starting
  52.773                                                                - (ii + 1), 0)),
  52.774 -                                               make_int (ending - (ii + 1)));
  52.775 +                                               make_fixnum (ending - (ii + 1)));
  52.776                  if (!NILP (positioned))
  52.777                    {
  52.778                      sequence = result = result_tail = XCDR (tail);
  52.779 @@ -4445,9 +4445,9 @@
  52.780                = list_position_cons_before (&ignore, keyed, XCDR (tail),
  52.781                                             check_test, test_not_unboundp,
  52.782                                             test, key, 0,
  52.783 -                                           make_int (max (starting - (ii + 1),
  52.784 +                                           make_fixnum (max (starting - (ii + 1),
  52.785                                                            0)),
  52.786 -                                           make_int (ending - (ii + 1)));
  52.787 +                                           make_fixnum (ending - (ii + 1)));
  52.788              if (!NILP (positioned))
  52.789                {
  52.790                  if (EQ (result, sequence))
  52.791 @@ -5044,7 +5044,7 @@
  52.792      c_array = alloca_array (Lisp_Object, len);                          \
  52.793      for (counter = 0; counter < len; ++counter)                         \
  52.794        {                                                                 \
  52.795 -        c_array[counter] = make_int (bit_vector_bit (v, counter));      \
  52.796 +        c_array[counter] = make_fixnum (bit_vector_bit (v, counter));      \
  52.797        }                                                                 \
  52.798    } while (0)
  52.799  
  52.800 @@ -5136,8 +5136,8 @@
  52.801      }
  52.802    else
  52.803      {
  52.804 -      Elemcount sequence_one_len = XINT (Flength (sequence_one)),
  52.805 -        sequence_two_len = XINT (Flength (sequence_two)), i;
  52.806 +      Elemcount sequence_one_len = XFIXNUM (Flength (sequence_one)),
  52.807 +        sequence_two_len = XFIXNUM (Flength (sequence_two)), i;
  52.808        Elemcount output_len = 1 + sequence_one_len + sequence_two_len;
  52.809        Lisp_Object *output = alloca_array (Lisp_Object, output_len),
  52.810          *sequence_one_storage = NULL, *sequence_two_storage = NULL;
  52.811 @@ -5243,10 +5243,10 @@
  52.812    Lisp_Object front = list;
  52.813    Lisp_Object len = Flength (list);
  52.814  
  52.815 -  if (XINT (len) < 2)
  52.816 +  if (XFIXNUM (len) < 2)
  52.817      return list;
  52.818  
  52.819 -  len = make_int (XINT (len) / 2 - 1);
  52.820 +  len = make_fixnum (XFIXNUM (len) / 2 - 1);
  52.821    tem = Fnthcdr (len, list);
  52.822    back = Fcdr (tem);
  52.823    Fsetcdr (tem, Qnil);
  52.824 @@ -5352,7 +5352,7 @@
  52.825  
  52.826        for (i = 0; i < sequence_len; ++i)
  52.827          {
  52.828 -          set_bit_vector_bit (v, i, XINT (sequence_carray [i]));
  52.829 +          set_bit_vector_bit (v, i, XFIXNUM (sequence_carray [i]));
  52.830          }
  52.831      }
  52.832  
  52.833 @@ -5387,8 +5387,8 @@
  52.834    Fcheck_valid_plist (a);
  52.835    Fcheck_valid_plist (b);
  52.836  
  52.837 -  la = XINT (Flength (a));
  52.838 -  lb = XINT (Flength (b));
  52.839 +  la = XFIXNUM (Flength (a));
  52.840 +  lb = XFIXNUM (Flength (b));
  52.841    m = (la > lb ? la : lb);
  52.842    fill = 0;
  52.843    keys  = alloca_array (Lisp_Object, m);
  52.844 @@ -6217,7 +6217,7 @@
  52.845  tweaked_internal_equal (Lisp_Object obj1, Lisp_Object obj2,
  52.846  			Lisp_Object depth)
  52.847  {
  52.848 -  return make_int (internal_equal (obj1, obj2, XINT (depth)));
  52.849 +  return make_fixnum (internal_equal (obj1, obj2, XFIXNUM (depth)));
  52.850  }
  52.851  
  52.852  int
  52.853 @@ -6233,11 +6233,11 @@
  52.854      va_call_trapping_problems (warning_class, warning_string,
  52.855  			       flags, p,
  52.856  			       (lisp_fn_t) tweaked_internal_equal,
  52.857 -			       3, obj1, obj2, make_int (depth));
  52.858 +			       3, obj1, obj2, make_fixnum (depth));
  52.859    if (UNBOUNDP (glorp))
  52.860      return retval;
  52.861    else
  52.862 -    return XINT (glorp);
  52.863 +    return XFIXNUM (glorp);
  52.864  }
  52.865  
  52.866  int
  52.867 @@ -6316,14 +6316,14 @@
  52.868      if (artype1 != artype2 && artype1 && artype2)
  52.869        {
  52.870  	EMACS_INT i;
  52.871 -	EMACS_INT l1 = XINT (Flength (obj1));
  52.872 -	EMACS_INT l2 = XINT (Flength (obj2));
  52.873 +	EMACS_INT l1 = XFIXNUM (Flength (obj1));
  52.874 +	EMACS_INT l2 = XFIXNUM (Flength (obj2));
  52.875  	/* Both arrays, but of different lengths */
  52.876  	if (l1 != l2)
  52.877  	  return 0;
  52.878  	for (i = 0; i < l1; i++)
  52.879 -	  if (!internal_equalp (Faref (obj1, make_int (i)),
  52.880 -				Faref (obj2, make_int (i)), depth + 1))
  52.881 +	  if (!internal_equalp (Faref (obj1, make_fixnum (i)),
  52.882 +				Faref (obj2, make_fixnum (i)), depth + 1))
  52.883  	    return 0;
  52.884  	return 1;
  52.885        }
  52.886 @@ -6600,17 +6600,17 @@
  52.887  {
  52.888    Lisp_Object sequence = args[0];
  52.889    Lisp_Object item = args[1];
  52.890 -  Elemcount starting, ending = EMACS_INT_MAX + 1, ii, len;
  52.891 +  Elemcount starting, ending = MOST_POSITIVE_FIXNUM + 1, ii, len;
  52.892  
  52.893    PARSE_KEYWORDS (Ffill, nargs, args, 2, (start, end), (start = Qzero));
  52.894  
  52.895    CHECK_NATNUM (start);
  52.896 -  starting = BIGNUMP (start) ? EMACS_INT_MAX + 1 : XINT (start);
  52.897 +  starting = BIGNUMP (start) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (start);
  52.898  
  52.899    if (!NILP (end))
  52.900      {
  52.901        CHECK_NATNUM (end);
  52.902 -      ending = BIGNUMP (end) ? EMACS_INT_MAX + 1 : XINT (end);
  52.903 +      ending = BIGNUMP (end) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (end);
  52.904      }
  52.905  
  52.906   retry:
  52.907 @@ -6628,7 +6628,7 @@
  52.908        CHECK_LISP_WRITEABLE (sequence);
  52.909        len = XVECTOR_LENGTH (sequence);
  52.910  
  52.911 -      check_sequence_range (sequence, start, end, make_int (len));
  52.912 +      check_sequence_range (sequence, start, end, make_fixnum (len));
  52.913        ending = min (ending, len);
  52.914  
  52.915        for (ii = starting; ii < ending; ++ii)
  52.916 @@ -6642,11 +6642,11 @@
  52.917        int bit;
  52.918  
  52.919        CHECK_BIT (item);
  52.920 -      bit = XINT (item);
  52.921 +      bit = XFIXNUM (item);
  52.922        CHECK_LISP_WRITEABLE (sequence);
  52.923        len = bit_vector_length (v);
  52.924  
  52.925 -      check_sequence_range (sequence, start, end, make_int (len));
  52.926 +      check_sequence_range (sequence, start, end, make_fixnum (len));
  52.927        ending = min (ending, len);
  52.928  
  52.929        for (ii = starting; ii < ending; ++ii)
  52.930 @@ -6987,7 +6987,7 @@
  52.931  		case lrecord_type_bit_vector:
  52.932  		  {
  52.933  		    args[j + 1]
  52.934 -		      = make_int (bit_vector_bit (XBIT_VECTOR (sequences[j]),
  52.935 +		      = make_fixnum (bit_vector_bit (XBIT_VECTOR (sequences[j]),
  52.936  						  i));
  52.937  		    break;
  52.938  		  }
  52.939 @@ -7049,7 +7049,7 @@
  52.940                      i < XVECTOR_LENGTH (lisp_vals) ?
  52.941                        (XVECTOR_DATA (lisp_vals)[i] = called) :
  52.942                        /* Let #'aset error. */
  52.943 -                      Faset (lisp_vals, make_int (i), called);
  52.944 +                      Faset (lisp_vals, make_fixnum (i), called);
  52.945                      break;
  52.946                    }
  52.947                  case lrecord_type_string:
  52.948 @@ -7063,8 +7063,8 @@
  52.949                      (BITP (called) &&
  52.950                       i < bit_vector_length (XBIT_VECTOR (lisp_vals))) ?
  52.951                        set_bit_vector_bit (XBIT_VECTOR (lisp_vals), i,
  52.952 -                                          XINT (called)) :
  52.953 -                      (void) Faset (lisp_vals, make_int (i), called);
  52.954 +                                          XFIXNUM (called)) :
  52.955 +                      (void) Faset (lisp_vals, make_fixnum (i), called);
  52.956                      break;
  52.957                    }
  52.958                  default:
  52.959 @@ -7079,7 +7079,7 @@
  52.960        if (lisp_vals_staging != NULL)
  52.961  	{
  52.962            CHECK_LISP_WRITEABLE (lisp_vals);
  52.963 -	  replace_string_range (lisp_vals, Qzero, make_int (call_count),
  52.964 +	  replace_string_range (lisp_vals, Qzero, make_fixnum (call_count),
  52.965  				lisp_vals_staging, cursor);
  52.966  	}
  52.967      }
  52.968 @@ -7093,7 +7093,7 @@
  52.969  static Elemcount
  52.970  shortest_length_among_sequences (int nsequences, Lisp_Object *sequences)
  52.971  {
  52.972 -  Elemcount len = 1 + EMACS_INT_MAX;
  52.973 +  Elemcount len = 1 + MOST_POSITIVE_FIXNUM;
  52.974    Lisp_Object length = Qnil;
  52.975    int i;
  52.976  
  52.977 @@ -7104,18 +7104,18 @@
  52.978            length = Flist_length (sequences[i]);
  52.979            if (!NILP (length))
  52.980              {
  52.981 -              len = min (len, XINT (length));
  52.982 +              len = min (len, XFIXNUM (length));
  52.983              }
  52.984          }
  52.985        else
  52.986          {
  52.987            CHECK_SEQUENCE (sequences[i]);
  52.988            length = Flength (sequences[i]);
  52.989 -          len = min (len, XINT (length));
  52.990 -        }
  52.991 -    }
  52.992 -
  52.993 -  if (len == 1 + EMACS_INT_MAX)
  52.994 +          len = min (len, XFIXNUM (length));
  52.995 +        }
  52.996 +    }
  52.997 +
  52.998 +  if (len == 1 + MOST_POSITIVE_FIXNUM)
  52.999      {
 52.1000        signal_circular_list_error (sequences[0]);
 52.1001      }
 52.1002 @@ -7143,7 +7143,7 @@
 52.1003    Lisp_Object function = args[0];
 52.1004    Lisp_Object sequence = args[1];
 52.1005    Lisp_Object separator = args[2];
 52.1006 -  Elemcount len = EMACS_INT_MAX;
 52.1007 +  Elemcount len = MOST_POSITIVE_FIXNUM;
 52.1008    Lisp_Object *args0;
 52.1009    EMACS_INT i, nargs0;
 52.1010  
 52.1011 @@ -7613,7 +7613,7 @@
 52.1012         (int nargs, Lisp_Object *args))
 52.1013  {
 52.1014    Lisp_Object function = args[0], sequence = args[1], accum = Qunbound;
 52.1015 -  Elemcount starting, ending = EMACS_INT_MAX + 1, ii = 0;
 52.1016 +  Elemcount starting, ending = MOST_POSITIVE_FIXNUM + 1, ii = 0;
 52.1017  
 52.1018    PARSE_KEYWORDS (Freduce, nargs, args, 5,
 52.1019                    (start, end, from_end, initial_value, key),
 52.1020 @@ -7621,7 +7621,7 @@
 52.1021  
 52.1022    CHECK_SEQUENCE (sequence);
 52.1023    CHECK_NATNUM (start);
 52.1024 -  starting = BIGNUMP (start) ? EMACS_INT_MAX + 1 : XINT (start);
 52.1025 +  starting = BIGNUMP (start) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (start);
 52.1026    CHECK_KEY_ARGUMENT (key);
 52.1027  
 52.1028  #define KEY(key, item) (EQ (Qidentity, key) ? item :			\
 52.1029 @@ -7632,7 +7632,7 @@
 52.1030    if (!NILP (end))
 52.1031      {
 52.1032        CHECK_NATNUM (end);
 52.1033 -      ending = BIGNUMP (end) ? EMACS_INT_MAX + 1 : XINT (end);
 52.1034 +      ending = BIGNUMP (end) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (end);
 52.1035      }
 52.1036  
 52.1037    if (VECTORP (sequence))
 52.1038 @@ -7640,7 +7640,7 @@
 52.1039        Lisp_Vector *vv = XVECTOR (sequence);
 52.1040        struct gcpro gcpro1;
 52.1041  
 52.1042 -      check_sequence_range (sequence, start, end, make_int (vv->size));
 52.1043 +      check_sequence_range (sequence, start, end, make_fixnum (vv->size));
 52.1044  
 52.1045        ending = min (ending, vv->size);
 52.1046  
 52.1047 @@ -7686,7 +7686,7 @@
 52.1048        Lisp_Bit_Vector *bv = XBIT_VECTOR (sequence);
 52.1049        struct gcpro gcpro1;
 52.1050  
 52.1051 -      check_sequence_range (sequence, start, end, make_int (bv->size));
 52.1052 +      check_sequence_range (sequence, start, end, make_fixnum (bv->size));
 52.1053        ending = min (ending, bv->size);
 52.1054  
 52.1055        GCPRO1 (accum);
 52.1056 @@ -7699,12 +7699,12 @@
 52.1057          {
 52.1058            if (NILP (from_end))
 52.1059              {
 52.1060 -              accum = KEY (key, make_int (bit_vector_bit (bv, starting)));
 52.1061 +              accum = KEY (key, make_fixnum (bit_vector_bit (bv, starting)));
 52.1062                starting++;
 52.1063              }
 52.1064            else
 52.1065              {
 52.1066 -              accum = KEY (key, make_int (bit_vector_bit (bv, ending - 1)));
 52.1067 +              accum = KEY (key, make_fixnum (bit_vector_bit (bv, ending - 1)));
 52.1068                ending--;
 52.1069              }
 52.1070          }
 52.1071 @@ -7714,7 +7714,7 @@
 52.1072            for (ii = starting; ii < ending; ++ii)
 52.1073              {
 52.1074                accum = CALL2 (function, accum,
 52.1075 -                             KEY (key, make_int (bit_vector_bit (bv, ii))));
 52.1076 +                             KEY (key, make_fixnum (bit_vector_bit (bv, ii))));
 52.1077              }
 52.1078          }
 52.1079        else
 52.1080 @@ -7722,7 +7722,7 @@
 52.1081            for (ii = ending - 1; ii >= starting; --ii)
 52.1082              {
 52.1083                accum = CALL2 (function, KEY (key,
 52.1084 -                                            make_int (bit_vector_bit (bv,
 52.1085 +                                            make_fixnum (bit_vector_bit (bv,
 52.1086                                                                        ii))),
 52.1087                               accum);
 52.1088              }
 52.1089 @@ -7802,9 +7802,9 @@
 52.1090            Bytecount cursor_offset, byte_len = XSTRING_LENGTH (sequence);
 52.1091            const Ibyte *cursor;
 52.1092  
 52.1093 -	  check_sequence_range (sequence, start, end, make_int (len));
 52.1094 +	  check_sequence_range (sequence, start, end, make_fixnum (len));
 52.1095            ending = min (ending, len);
 52.1096 -          starting = XINT (start);
 52.1097 +          starting = XFIXNUM (start);
 52.1098  
 52.1099            cursor = string_char_addr (sequence, ending - 1);
 52.1100            cursor_offset = cursor - XSTRING_DATA (sequence);
 52.1101 @@ -7917,8 +7917,8 @@
 52.1102            Elemcount counting = 0, len = 0;
 52.1103  	  struct gcpro gcpro1;
 52.1104  
 52.1105 -	  len = XINT (Flength (sequence));
 52.1106 -	  check_sequence_range (sequence, start, end, make_int (len));
 52.1107 +	  len = XFIXNUM (Flength (sequence));
 52.1108 +	  check_sequence_range (sequence, start, end, make_fixnum (len));
 52.1109  	  ending = min (ending, len);
 52.1110  
 52.1111            /* :from-end with a list; make an alloca copy of the relevant list
 52.1112 @@ -8048,7 +8048,7 @@
 52.1113      *pend = p + XSTRING_LENGTH (dest), *pcursor, item_buf[MAX_ICHAR_LEN];
 52.1114    Bytecount prefix_bytecount, source_len = source_limit - source;
 52.1115    Charcount ii = 0, ending, len;
 52.1116 -  Charcount starting = BIGNUMP (start) ? EMACS_INT_MAX + 1 : XINT (start);
 52.1117 +  Charcount starting = BIGNUMP (start) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (start);
 52.1118    Elemcount delta;
 52.1119  
 52.1120    while (ii < starting && p < pend)
 52.1121 @@ -8071,7 +8071,7 @@
 52.1122      }
 52.1123    else
 52.1124      {
 52.1125 -      ending = BIGNUMP (end) ? EMACS_INT_MAX + 1 : XINT (end);
 52.1126 +      ending = BIGNUMP (end) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (end);
 52.1127        while (ii < ending && pcursor < pend)
 52.1128  	{
 52.1129  	  INC_IBYTEPTR (pcursor);
 52.1130 @@ -8082,7 +8082,7 @@
 52.1131    if (pcursor == pend)
 52.1132      {
 52.1133        /* We have the length, check it for our callers. */
 52.1134 -      check_sequence_range (dest, start, end, make_int (ii));
 52.1135 +      check_sequence_range (dest, start, end, make_fixnum (ii));
 52.1136      }
 52.1137  
 52.1138    if (!(p == pend || p == pcursor))
 52.1139 @@ -8151,8 +8151,8 @@
 52.1140  {
 52.1141    Lisp_Object sequence1 = args[0], sequence2 = args[1],
 52.1142      result = sequence1;
 52.1143 -  Elemcount starting1, ending1 = EMACS_INT_MAX + 1, starting2;
 52.1144 -  Elemcount ending2 = EMACS_INT_MAX + 1, counting = 0, startcounting;
 52.1145 +  Elemcount starting1, ending1 = MOST_POSITIVE_FIXNUM + 1, starting2;
 52.1146 +  Elemcount ending2 = MOST_POSITIVE_FIXNUM + 1, counting = 0, startcounting;
 52.1147    Boolint sequence1_listp, sequence2_listp,
 52.1148      overwriting = EQ (sequence1, sequence2);
 52.1149  
 52.1150 @@ -8165,20 +8165,20 @@
 52.1151    CHECK_SEQUENCE (sequence2);
 52.1152  
 52.1153    CHECK_NATNUM (start1);
 52.1154 -  starting1 = BIGNUMP (start1) ? EMACS_INT_MAX + 1 : XINT (start1);
 52.1155 +  starting1 = BIGNUMP (start1) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (start1);
 52.1156    CHECK_NATNUM (start2);
 52.1157 -  starting2 = BIGNUMP (start2) ? EMACS_INT_MAX + 1 : XINT (start2);
 52.1158 +  starting2 = BIGNUMP (start2) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (start2);
 52.1159  
 52.1160    if (!NILP (end1))
 52.1161      {
 52.1162        CHECK_NATNUM (end1);
 52.1163 -      ending1 = BIGNUMP (end1) ? EMACS_INT_MAX + 1 : XINT (end1);
 52.1164 +      ending1 = BIGNUMP (end1) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (end1);
 52.1165      }
 52.1166  
 52.1167    if (!NILP (end2))
 52.1168      {
 52.1169        CHECK_NATNUM (end2);
 52.1170 -      ending2 = BIGNUMP (end2) ? EMACS_INT_MAX + 1 : XINT (end2);
 52.1171 +      ending2 = BIGNUMP (end2) ? MOST_POSITIVE_FIXNUM + 1 : XFIXNUM (end2);
 52.1172      }
 52.1173  
 52.1174    sequence1_listp = LISTP (sequence1);
 52.1175 @@ -8227,7 +8227,7 @@
 52.1176  
 52.1177        if (CONSP (sequence2))
 52.1178          {
 52.1179 -          Elemcount len = XINT (Flength (sequence2));
 52.1180 +          Elemcount len = XFIXNUM (Flength (sequence2));
 52.1181            Lisp_Object *subsequence
 52.1182              = alloca_array (Lisp_Object, min (ending2, len));
 52.1183            Elemcount ii = 0;
 52.1184 @@ -8244,12 +8244,12 @@
 52.1185              }
 52.1186  
 52.1187            check_sequence_range (sequence1, start1, end1,
 52.1188 -                                /* The XINT (start2) is intentional here; we
 52.1189 +                                /* The XFIXNUM (start2) is intentional here; we
 52.1190                                     called #'length after doing (nthcdr
 52.1191                                     start2 sequence2). */
 52.1192 -                                make_int (XINT (start2) + len));
 52.1193 +                                make_fixnum (XFIXNUM (start2) + len));
 52.1194            check_sequence_range (sequence2, start2, end2,
 52.1195 -                                make_int (XINT (start2) + len));
 52.1196 +                                make_fixnum (XFIXNUM (start2) + len));
 52.1197  
 52.1198            while (starting1 < ending1
 52.1199                   && starting2 < ending2 && !NILP (sequence1))
 52.1200 @@ -8284,8 +8284,8 @@
 52.1201  
 52.1202            if (pcursor == pend)
 52.1203              {
 52.1204 -              check_sequence_range (sequence1, start1, end1, make_int (ii));
 52.1205 -              check_sequence_range (sequence2, start2, end2, make_int (ii));
 52.1206 +              check_sequence_range (sequence1, start1, end1, make_fixnum (ii));
 52.1207 +              check_sequence_range (sequence2, start2, end2, make_fixnum (ii));
 52.1208              }
 52.1209            else
 52.1210              {
 52.1211 @@ -8293,23 +8293,23 @@
 52.1212                staging = alloca_ibytes (pcursor - p);
 52.1213                memcpy (staging, p, pcursor - p);
 52.1214                replace_string_range (result, start1,
 52.1215 -                                    make_int (starting1),
 52.1216 +                                    make_fixnum (starting1),
 52.1217                                      staging, staging + (pcursor - p));
 52.1218              }
 52.1219          }
 52.1220        else 
 52.1221          {
 52.1222 -          Elemcount seq_len = XINT (Flength (sequence2)), ii = 0,
 52.1223 +          Elemcount seq_len = XFIXNUM (Flength (sequence2)), ii = 0,
 52.1224              subseq_len = min (min (ending1 - starting1, seq_len - starting1),
 52.1225                                min (ending2 - starting2, seq_len - starting2));
 52.1226            Lisp_Object *subsequence = alloca_array (Lisp_Object, subseq_len);
 52.1227  
 52.1228 -          check_sequence_range (sequence1, start1, end1, make_int (seq_len));
 52.1229 -          check_sequence_range (sequence2, start2, end2, make_int (seq_len));
 52.1230 +          check_sequence_range (sequence1, start1, end1, make_fixnum (seq_len));
 52.1231 +          check_sequence_range (sequence2, start2, end2, make_fixnum (seq_len));
 52.1232  
 52.1233            while (starting2 < ending2 && ii < seq_len)
 52.1234              {
 52.1235 -              subsequence[ii] = Faref (sequence2, make_int (starting2));
 52.1236 +              subsequence[ii] = Faref (sequence2, make_fixnum (starting2));
 52.1237                ii++, starting2++;
 52.1238              }
 52.1239  
 52.1240 @@ -8317,7 +8317,7 @@
 52.1241  
 52.1242            while (starting1 < ending1 && ii < seq_len)
 52.1243              {
 52.1244 -              Faset (sequence1, make_int (starting1), subsequence[ii]);
 52.1245 +              Faset (sequence1, make_fixnum (starting1), subsequence[ii]);
 52.1246                ii++, starting1++;
 52.1247              }
 52.1248          }
 52.1249 @@ -8365,12 +8365,12 @@
 52.1250        if (NILP (sequence1))
 52.1251          {
 52.1252            check_sequence_range (args[0], start1, end1,
 52.1253 -                                make_int (XINT (start1) + shortest_len));
 52.1254 +                                make_fixnum (XFIXNUM (start1) + shortest_len));
 52.1255          }
 52.1256        else if (NILP (sequence2))
 52.1257          {
 52.1258            check_sequence_range (args[1], start2, end2,
 52.1259 -                                make_int (XINT (start2) + shortest_len));
 52.1260 +                                make_fixnum (XFIXNUM (start2) + shortest_len));
 52.1261          }
 52.1262      }
 52.1263    else if (sequence1_listp)
 52.1264 @@ -8405,26 +8405,26 @@
 52.1265            if (NILP (sequence1))
 52.1266              {
 52.1267                check_sequence_range (sequence1, start1, end1,
 52.1268 -                                    make_int (XINT (start1) + starting1));
 52.1269 +                                    make_fixnum (XFIXNUM (start1) + starting1));
 52.1270              }
 52.1271  
 52.1272            if (s2_data == s2_end)
 52.1273              {
 52.1274                check_sequence_range (sequence2, start2, end2,
 52.1275 -                                    make_int (char_count));
 52.1276 +                                    make_fixnum (char_count));
 52.1277              }
 52.1278          }
 52.1279        else
 52.1280          {
 52.1281 -          Elemcount len2 = XINT (Flength (sequence2));
 52.1282 -          check_sequence_range (sequence2, start2, end2, make_int (len2));
 52.1283 +          Elemcount len2 = XFIXNUM (Flength (sequence2));
 52.1284 +          check_sequence_range (sequence2, start2, end2, make_fixnum (len2));
 52.1285  
 52.1286            ending2 = min (ending2, len2);
 52.1287            while (starting2 < ending2
 52.1288                   && starting1 < ending1 && !NILP (sequence1))
 52.1289              {
 52.1290                CHECK_CONS (sequence1);
 52.1291 -              XSETCAR (sequence1, Faref (sequence2, make_int (starting2)));
 52.1292 +              XSETCAR (sequence1, Faref (sequence2, make_fixnum (starting2)));
 52.1293                sequence1 = XCDR (sequence1);
 52.1294                starting1++;
 52.1295                starting2++;
 52.1296 @@ -8433,7 +8433,7 @@
 52.1297            if (NILP (sequence1))
 52.1298              {
 52.1299                check_sequence_range (args[0], start1, end1,
 52.1300 -                                    make_int (XINT (start1) + starting1));
 52.1301 +                                    make_fixnum (XFIXNUM (start1) + starting1));
 52.1302              }
 52.1303          }
 52.1304      }
 52.1305 @@ -8445,7 +8445,7 @@
 52.1306            Ibyte *staging, *cursor;
 52.1307            Lisp_Object obj;
 52.1308  
 52.1309 -          check_sequence_range (sequence1, start1, end1, make_int (len));
 52.1310 +          check_sequence_range (sequence1, start1, end1, make_fixnum (len));
 52.1311            ending1 = min (ending1, len);
 52.1312            count = ending1 - starting1;
 52.1313            staging = cursor = alloca_ibytes (count * MAX_ICHAR_LEN);
 52.1314 @@ -8464,22 +8464,22 @@
 52.1315            if (NILP (sequence2))
 52.1316              {
 52.1317                check_sequence_range (sequence2, start2, end2,
 52.1318 -                                    make_int (XINT (start2) + ii));
 52.1319 -            }
 52.1320 -
 52.1321 -          replace_string_range (result, start1, make_int (XINT (start1) + ii),
 52.1322 +                                    make_fixnum (XFIXNUM (start2) + ii));
 52.1323 +            }
 52.1324 +
 52.1325 +          replace_string_range (result, start1, make_fixnum (XFIXNUM (start1) + ii),
 52.1326                                  staging, cursor);
 52.1327          }
 52.1328        else
 52.1329          {
 52.1330 -          Elemcount len = XINT (Flength (sequence1));
 52.1331 -
 52.1332 -          check_sequence_range (sequence1, start2, end1, make_int (len));
 52.1333 +          Elemcount len = XFIXNUM (Flength (sequence1));
 52.1334 +
 52.1335 +          check_sequence_range (sequence1, start2, end1, make_fixnum (len));
 52.1336            ending1 = min (ending2, min (ending1, len));
 52.1337  
 52.1338            while (starting1 < ending1 && !NILP (sequence2))
 52.1339              {
 52.1340 -              Faset (sequence1, make_int (starting1),
 52.1341 +              Faset (sequence1, make_fixnum (starting1),
 52.1342                       CONSP (sequence2) ? XCAR (sequence2)
 52.1343                       : Fcar (sequence2));
 52.1344                sequence2 = XCDR (sequence2);
 52.1345 @@ -8490,7 +8490,7 @@
 52.1346            if (NILP (sequence2))
 52.1347              {
 52.1348                check_sequence_range (args[1], start2, end2,
 52.1349 -                                    make_int (XINT (start2) + starting2));
 52.1350 +                                    make_fixnum (XFIXNUM (start2) + starting2));
 52.1351              }
 52.1352          }
 52.1353      }
 52.1354 @@ -8502,7 +8502,7 @@
 52.1355              *p2end = p2 + XSTRING_LENGTH (sequence2), *p2cursor;
 52.1356            Charcount ii = 0, len1 = string_char_length (sequence1);
 52.1357  
 52.1358 -          check_sequence_range (sequence1, start1, end1, make_int (len1));
 52.1359 +          check_sequence_range (sequence1, start1, end1, make_fixnum (len1));
 52.1360  
 52.1361            while (ii < starting2 && p2 < p2end)
 52.1362              {
 52.1363 @@ -8522,23 +8522,23 @@
 52.1364  
 52.1365            if (p2cursor == p2end)
 52.1366              {
 52.1367 -              check_sequence_range (sequence2, start2, end2, make_int (ii));
 52.1368 +              check_sequence_range (sequence2, start2, end2, make_fixnum (ii));
 52.1369              }
 52.1370  
 52.1371            /* This isn't great; any error message won't necessarily reflect
 52.1372               the END1 that was supplied to #'replace. */
 52.1373 -          replace_string_range (result, start1, make_int (starting1),
 52.1374 +          replace_string_range (result, start1, make_fixnum (starting1),
 52.1375                                  p2, p2cursor);
 52.1376          }
 52.1377        else if (STRINGP (sequence1))
 52.1378          {
 52.1379            Ibyte *staging, *cursor;
 52.1380            Elemcount count, len1 = string_char_length (sequence1);
 52.1381 -          Elemcount len2 = XINT (Flength (sequence2)), ii = 0;
 52.1382 +          Elemcount len2 = XFIXNUM (Flength (sequence2)), ii = 0;
 52.1383            Lisp_Object obj;
 52.1384  
 52.1385 -          check_sequence_range (sequence1, start1, end1, make_int (len1));
 52.1386 -          check_sequence_range (sequence2, start2, end2, make_int (len2));
 52.1387 +          check_sequence_range (sequence1, start1, end1, make_fixnum (len1));
 52.1388 +          check_sequence_range (sequence2, start2, end2, make_fixnum (len2));
 52.1389  
 52.1390            ending1 = min (ending1, len1);
 52.1391            ending2 = min (ending2, len2);
 52.1392 @@ -8548,7 +8548,7 @@
 52.1393            ii = 0;
 52.1394            while (ii < count)
 52.1395              {
 52.1396 -              obj = Faref (sequence2, make_int (starting2));
 52.1397 +              obj = Faref (sequence2, make_fixnum (starting2));
 52.1398  
 52.1399                CHECK_CHAR_COERCE_INT (obj);
 52.1400                cursor += set_itext_ichar (cursor, XCHAR (obj));
 52.1401 @@ -8556,16 +8556,16 @@
 52.1402              }
 52.1403  
 52.1404            replace_string_range (result, start1,
 52.1405 -                                make_int (XINT (start1) + count),
 52.1406 +                                make_fixnum (XFIXNUM (start1) + count),
 52.1407                                  staging, cursor);
 52.1408          }
 52.1409        else if (STRINGP (sequence2))
 52.1410          {
 52.1411            Ibyte *p2 = XSTRING_DATA (sequence2),
 52.1412              *p2end = p2 + XSTRING_LENGTH (sequence2);
 52.1413 -          Elemcount len1 = XINT (Flength (sequence1)), ii = 0;
 52.1414 -
 52.1415 -          check_sequence_range (sequence1, start1, end1, make_int (len1));
 52.1416 +          Elemcount len1 = XFIXNUM (Flength (sequence1)), ii = 0;
 52.1417 +
 52.1418 +          check_sequence_range (sequence1, start1, end1, make_fixnum (len1));
 52.1419            ending1 = min (ending1, len1);
 52.1420  
 52.1421            while (ii < starting2 && p2 < p2end)
 52.1422 @@ -8576,7 +8576,7 @@
 52.1423  
 52.1424            while (p2 < p2end && starting1 < ending1 && starting2 < ending2)
 52.1425              {
 52.1426 -              Faset (sequence1, make_int (starting1),
 52.1427 +              Faset (sequence1, make_fixnum (starting1),
 52.1428                       make_char (itext_ichar (p2)));
 52.1429                INC_IBYTEPTR (p2);
 52.1430                starting1++;
 52.1431 @@ -8586,24 +8586,24 @@
 52.1432  
 52.1433            if (p2 == p2end)
 52.1434              {
 52.1435 -              check_sequence_range (sequence2, start2, end2, make_int (ii));
 52.1436 +              check_sequence_range (sequence2, start2, end2, make_fixnum (ii));
 52.1437              }
 52.1438          }
 52.1439        else
 52.1440          {
 52.1441 -          Elemcount len1 = XINT (Flength (sequence1)),
 52.1442 -            len2 = XINT (Flength (sequence2));
 52.1443 -
 52.1444 -          check_sequence_range (sequence1, start1, end1, make_int (len1));
 52.1445 -          check_sequence_range (sequence2, start2, end2, make_int (len2));
 52.1446 +          Elemcount len1 = XFIXNUM (Flength (sequence1)),
 52.1447 +            len2 = XFIXNUM (Flength (sequence2));
 52.1448 +
 52.1449 +          check_sequence_range (sequence1, start1, end1, make_fixnum (len1));
 52.1450 +          check_sequence_range (sequence2, start2, end2, make_fixnum (len2));
 52.1451  
 52.1452            ending1 = min (ending1, len1);
 52.1453            ending2 = min (ending2, len2);
 52.1454            
 52.1455            while (starting1 < ending1 && starting2 < ending2)
 52.1456              {
 52.1457 -              Faset (sequence1, make_int (starting1),
 52.1458 -                     Faref (sequence2, make_int (starting2)));
 52.1459 +              Faset (sequence1, make_fixnum (starting1),
 52.1460 +                     Faref (sequence2, make_fixnum (starting2)));
 52.1461                starting1++;
 52.1462                starting2++;
 52.1463              }
 52.1464 @@ -8625,8 +8625,8 @@
 52.1465  {
 52.1466    Lisp_Object new_ = args[0], item = args[1], sequence = args[2];
 52.1467    Lisp_Object object_, position0;
 52.1468 -  Elemcount starting = 0, ending = EMACS_INT_MAX, encountered = 0;
 52.1469 -  Elemcount len, ii = 0, counting = EMACS_INT_MAX, presenting = 0;
 52.1470 +  Elemcount starting = 0, ending = MOST_POSITIVE_FIXNUM, encountered = 0;
 52.1471 +  Elemcount len, ii = 0, counting = MOST_POSITIVE_FIXNUM, presenting = 0;
 52.1472    Boolint test_not_unboundp = 1;
 52.1473    check_test_func_t check_test = NULL;
 52.1474  
 52.1475 @@ -8636,26 +8636,26 @@
 52.1476  
 52.1477    CHECK_SEQUENCE (sequence);
 52.1478    CHECK_NATNUM (start);
 52.1479 -  starting = BIGNUMP (start) ? 1 + EMACS_INT_MAX : XINT (start);
 52.1480 +  starting = BIGNUMP (start) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (start);
 52.1481  
 52.1482    if (!NILP (end))
 52.1483      {
 52.1484        CHECK_NATNUM (end);
 52.1485 -      ending = BIGNUMP (end) ? 1 + EMACS_INT_MAX : XINT (end);
 52.1486 +      ending = BIGNUMP (end) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (end);
 52.1487      }
 52.1488  
 52.1489    if (!NILP (count))
 52.1490      {
 52.1491        CHECK_INTEGER (count);
 52.1492 -      if (INTP (count))
 52.1493 -        {
 52.1494 -          counting = XINT (count);
 52.1495 +      if (FIXNUMP (count))
 52.1496 +        {
 52.1497 +          counting = XFIXNUM (count);
 52.1498          }
 52.1499  #ifdef HAVE_BIGNUM
 52.1500        else
 52.1501          {
 52.1502            counting = bignum_sign (XBIGNUM_DATA (count)) > 0 ?
 52.1503 -            1 + EMACS_INT_MAX : -1 + EMACS_INT_MIN;
 52.1504 +            1 + MOST_POSITIVE_FIXNUM : -1 + MOST_NEGATIVE_FIXNUM;
 52.1505          }
 52.1506  #endif
 52.1507  
 52.1508 @@ -8680,7 +8680,7 @@
 52.1509  	      return sequence;
 52.1510  	    }
 52.1511  
 52.1512 -	  presenting = XINT (present);
 52.1513 +	  presenting = XFIXNUM (present);
 52.1514  	  presenting = presenting <= counting ? 0 : presenting - counting;
 52.1515  	}
 52.1516  
 52.1517 @@ -8743,7 +8743,7 @@
 52.1518  	      return sequence;
 52.1519  	    }
 52.1520  
 52.1521 -	  presenting = XINT (present);
 52.1522 +	  presenting = XFIXNUM (present);
 52.1523  
 52.1524  	  /* If there are fewer items in the string than we have
 52.1525  	     permission to change, we don't need to differentiate
 52.1526 @@ -8801,7 +8801,7 @@
 52.1527        if (0 != encountered)
 52.1528  	{
 52.1529  	  CHECK_LISP_WRITEABLE (sequence);
 52.1530 -	  replace_string_range (sequence, Qzero, make_int (ii),
 52.1531 +	  replace_string_range (sequence, Qzero, make_fixnum (ii),
 52.1532  				staging, staging_cursor);
 52.1533  	}
 52.1534      }
 52.1535 @@ -8810,8 +8810,8 @@
 52.1536        Elemcount positioning;
 52.1537        Lisp_Object object = Qnil;
 52.1538  
 52.1539 -      len = XINT (Flength (sequence));
 52.1540 -      check_sequence_range (sequence, start, end, make_int (len));
 52.1541 +      len = XFIXNUM (Flength (sequence));
 52.1542 +      check_sequence_range (sequence, start, end, make_fixnum (len));
 52.1543  
 52.1544        position0 = position (&object, item, sequence, check_test,
 52.1545                              test_not_unboundp, test, key, start, end, from_end,
 52.1546 @@ -8822,7 +8822,7 @@
 52.1547  	  return sequence;
 52.1548  	}
 52.1549  
 52.1550 -      positioning = XINT (position0);
 52.1551 +      positioning = XFIXNUM (position0);
 52.1552        ending = min (len, ending);
 52.1553  
 52.1554        Faset (sequence, position0, new_);
 52.1555 @@ -8832,12 +8832,12 @@
 52.1556  	{
 52.1557  	  for (ii = positioning + 1; ii < ending; ii++)
 52.1558  	    {
 52.1559 -	      object_ = Faref (sequence, make_int (ii));
 52.1560 +	      object_ = Faref (sequence, make_fixnum (ii));
 52.1561  
 52.1562  	      if (check_test (test, key, item, object_) == test_not_unboundp
 52.1563  		  && encountered++ < counting)
 52.1564  		{
 52.1565 -		  Faset (sequence, make_int (ii), new_);
 52.1566 +		  Faset (sequence, make_fixnum (ii), new_);
 52.1567  		}
 52.1568  	      else if (encountered == counting)
 52.1569  		{
 52.1570 @@ -8849,12 +8849,12 @@
 52.1571  	{
 52.1572  	  for (ii = positioning - 1; ii >= starting; ii--)
 52.1573  	    {
 52.1574 -	      object_ = Faref (sequence, make_int (ii));
 52.1575 +	      object_ = Faref (sequence, make_fixnum (ii));
 52.1576  
 52.1577  	      if (check_test (test, key, item, object_) == test_not_unboundp
 52.1578  		  && encountered++ < counting)
 52.1579  		{
 52.1580 -		  Faset (sequence, make_int (ii), new_);
 52.1581 +		  Faset (sequence, make_fixnum (ii), new_);
 52.1582  		}
 52.1583  	      else if (encountered == counting)
 52.1584  		{
 52.1585 @@ -8882,8 +8882,8 @@
 52.1586    Lisp_Object new_ = args[0], item = args[1], sequence = args[2], tail = Qnil;
 52.1587    Lisp_Object result = Qnil, result_tail = Qnil;
 52.1588    Lisp_Object object, position0, matched_count;
 52.1589 -  Elemcount starting = 0, ending = EMACS_INT_MAX, encountered = 0;
 52.1590 -  Elemcount ii = 0, counting = EMACS_INT_MAX, presenting = 0;
 52.1591 +  Elemcount starting = 0, ending = MOST_POSITIVE_FIXNUM, encountered = 0;
 52.1592 +  Elemcount ii = 0, counting = MOST_POSITIVE_FIXNUM, presenting = 0;
 52.1593    Boolint test_not_unboundp = 1;
 52.1594    check_test_func_t check_test = NULL;
 52.1595    struct gcpro gcpro1;
 52.1596 @@ -8895,12 +8895,12 @@
 52.1597    CHECK_SEQUENCE (sequence);
 52.1598  
 52.1599    CHECK_NATNUM (start);
 52.1600 -  starting = BIGNUMP (start) ? 1 + EMACS_INT_MAX : XINT (start);
 52.1601 +  starting = BIGNUMP (start) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (start);
 52.1602  
 52.1603    if (!NILP (end))
 52.1604      {
 52.1605        CHECK_NATNUM (end);
 52.1606 -      ending = BIGNUMP (end) ? 1 + EMACS_INT_MAX : XINT (end);
 52.1607 +      ending = BIGNUMP (end) ? 1 + MOST_POSITIVE_FIXNUM : XFIXNUM (end);
 52.1608      }
 52.1609  
 52.1610    check_test = get_check_test_function (item, &test, test_not, if_, if_not,
 52.1611 @@ -8911,15 +8911,15 @@
 52.1612        if (!NILP (count))
 52.1613  	{
 52.1614            CHECK_INTEGER (count);
 52.1615 -          if (INTP (count))