Mercurial > hg > xemacs-beta

diff src/select-x.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 308d34e9f07d
children 79e9934779c1
line wrap: on
line diff
--- a/src/select-x.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/select-x.c	Sun Oct 09 09:51:57 2011 +0100
@@ -978,7 +978,7 @@
   /* add a timeout handler */
   if (x_selection_timeout > 0)
     {
-      Lisp_Object id = Fadd_timeout (make_int (x_selection_timeout),
+      Lisp_Object id = Fadd_timeout (make_fixnum (x_selection_timeout),
 				     Qx_selection_reply_timeout_internal,
 				     Qnil, Qnil);
       record_unwind_protect (Fdisable_timeout, id);
@@ -1362,7 +1362,7 @@
   if (format != 8 || type != XA_STRING)
     invalid_state_2 ("Cut buffer doesn't contain 8-bit STRING data",
 		     x_atom_to_symbol (d, type),
-		     make_int (format));
+		     make_fixnum (format));
 
   /* We cheat - if the string contains an ESC character, that's
      technically not allowed in a STRING, so we assume it's
@@ -1467,8 +1467,8 @@
   Window window = RootWindow (display, 0); /* Cutbuffers are on frame 0 */
   Atom props [8];
 
-  CHECK_INT (n);
-  if (XINT (n) == 0)
+  CHECK_FIXNUM (n);
+  if (XFIXNUM (n) == 0)
     return n;
   if (! cut_buffers_initialized)
     initialize_cut_buffers (display, window);
@@ -1480,7 +1480,7 @@
   props[5] = XA_CUT_BUFFER5;
   props[6] = XA_CUT_BUFFER6;
   props[7] = XA_CUT_BUFFER7;
-  XRotateWindowProperties (display, window, props, 8, XINT (n));
+  XRotateWindowProperties (display, window, props, 8, XFIXNUM (n));
   return n;
 }