Mercurial > hg > xemacs-beta

diff src/emacs.c @ 5581:56144c8593a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 09 Oct 2011 09:51:57 +0100
parents 58b38d5b32d0
children 1a507c4c6c42
line wrap: on
line diff
--- a/src/emacs.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/emacs.c	Sun Oct 09 09:51:57 2011 +0100
@@ -735,7 +735,7 @@
 make_argc_argv (Lisp_Object argv_list, int *argc, Wexttext ***argv)
 {
   Lisp_Object next;
-  int n = XINT (Flength (argv_list));
+  int n = XFIXNUM (Flength (argv_list));
   REGISTER int i;
   *argv = xnew_array (Wexttext *, n + 1);
 
@@ -2060,7 +2060,7 @@
 	    - build_cistring()
 	    - build_ascstring()
 	    - make_vector()
-	    - make_int()
+	    - make_fixnum()
 	    - make_char()
 	    - make_extent()
 	    - ALLOC_NORMAL_LISP_OBJECT()
@@ -3788,7 +3788,7 @@
     voodoo_free_hook;
 #endif
 
-  exit (INTP (arg) ? XINT (arg) : 0);
+  exit (FIXNUMP (arg) ? XFIXNUM (arg) : 0);
   RETURN_NOT_REACHED (Qnil);
 }
 
@@ -4299,7 +4299,7 @@
   FSF Emacs:   19.23
   XEmacs:      19.10
 */ );
-  Vemacs_major_version = make_int (EMACS_MAJOR_VERSION);
+  Vemacs_major_version = make_fixnum (EMACS_MAJOR_VERSION);
 
   DEFVAR_LISP ("emacs-minor-version", &Vemacs_minor_version /*
 Minor version number of this version of Emacs, as an integer.
@@ -4307,7 +4307,7 @@
   FSF Emacs:   19.23
   XEmacs:      19.10
 */ );
-  Vemacs_minor_version = make_int (EMACS_MINOR_VERSION);
+  Vemacs_minor_version = make_fixnum (EMACS_MINOR_VERSION);
 
   DEFVAR_LISP ("emacs-patch-level", &Vemacs_patch_level /*
 The patch level of this version of Emacs, as an integer.
@@ -4317,7 +4317,7 @@
 earlier than 21.1.1
 */ );
 #ifdef EMACS_PATCH_LEVEL
-  Vemacs_patch_level = make_int (EMACS_PATCH_LEVEL);
+  Vemacs_patch_level = make_fixnum (EMACS_PATCH_LEVEL);
 #else
   Vemacs_patch_level = Qnil;
 #endif
@@ -4329,7 +4329,7 @@
 earlier than 20.3.
 */ );
 #ifdef EMACS_BETA_VERSION
-  Vemacs_beta_version = make_int (EMACS_BETA_VERSION);
+  Vemacs_beta_version = make_fixnum (EMACS_BETA_VERSION);
 #else
   Vemacs_beta_version = Qnil;
 #endif