Mercurial > hg > xemacs-beta

diff src/abbrev.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 0af042a0c116
children 2014ff433daf
line wrap: on
line diff
--- a/src/abbrev.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/abbrev.c	Sun Oct 09 09:51:57 2011 +0100
@@ -370,13 +370,13 @@
       if (!abbrev_all_caps
 	  && scan_words (buf, point, -1) > scan_words (buf, abbrev_start, 1))
 	{
-	  Fupcase_initials_region (make_int (abbrev_start), make_int (point),
+	  Fupcase_initials_region (make_fixnum (abbrev_start), make_fixnum (point),
 				   wrap_buffer (buf));
 	}
       else
 	{
 	  /* If expansion is one word, or if user says so, upcase it all. */
-	  Fupcase_region (make_int (abbrev_start), make_int (point),
+	  Fupcase_region (make_fixnum (abbrev_start), make_fixnum (point),
 			  wrap_buffer (buf));
 	}
     }
@@ -390,7 +390,7 @@
 				BUF_FETCH_CHAR (buf, pos)))
 	pos++;
       /* Change just that.  */
-      Fupcase_initials_region (make_int (pos), make_int (pos + 1),
+      Fupcase_initials_region (make_fixnum (pos), make_fixnum (pos + 1),
 			       wrap_buffer (buf));
     }
 
@@ -408,7 +408,7 @@
   /* This function can GC */
   struct buffer *buf = current_buffer;
 
-  if (INTP (XSYMBOL (sym)->plist))
+  if (FIXNUMP (XSYMBOL (sym)->plist))
     {
       count = XSYMBOL (sym)->plist;
       system_flag = Qnil;
@@ -441,7 +441,7 @@
   /* This function can GC */
   struct buffer *buf = current_buffer;
 
-  if (INTP (XSYMBOL (sym)->plist))
+  if (FIXNUMP (XSYMBOL (sym)->plist))
     {
       count = XSYMBOL (sym)->plist;
       system_flag = Qnil;
@@ -455,23 +455,23 @@
   if (NILP (XSYMBOL_VALUE (sym)))
     return;
 
-  one = make_int (1);
+  one = make_fixnum (1);
   Fprin1 (Fsymbol_name (sym), stream);
 
   if (!NILP (system_flag))
     {
       buffer_insert_ascstring (buf, " (sys)");
-      Findent_to (make_int (20), one, Qnil);
+      Findent_to (make_fixnum (20), one, Qnil);
     }
   else
-    Findent_to (make_int (15), one, Qnil);
+    Findent_to (make_fixnum (15), one, Qnil);
 
   Fprin1 (count, stream);
-  Findent_to (make_int (20), one, Qnil);
+  Findent_to (make_fixnum (20), one, Qnil);
   Fprin1 (XSYMBOL_VALUE (sym), stream);
   if (!NILP (XSYMBOL (sym)->function))
     {
-      Findent_to (make_int (45), one, Qnil);
+      Findent_to (make_fixnum (45), one, Qnil);
       Fprin1 (XSYMBOL (sym)->function, stream);
     }
   buffer_insert_ascstring (buf, "\n");