Mercurial > hg > xemacs-beta
diff src/device-x.c @ 5581:56144c8593a8
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 | 1d1f385c9149 |
line wrap: on
line diff
--- a/src/device-x.c Sat Oct 08 12:26:09 2011 +0100 +++ b/src/device-x.c Sun Oct 09 09:51:57 2011 +0100 @@ -1617,10 +1617,10 @@ else if (EQ (type, Qnatnum) && i < 0) return maybe_signal_continuable_error_2 (Qinvalid_argument, "Invalid numerical value for resource", - make_int (i), build_extstring (name_string, Qbinary), + make_fixnum (i), build_extstring (name_string, Qbinary), Qresource, errb); else - return make_int (i); + return make_fixnum (i); } else { @@ -1735,7 +1735,7 @@ */ (device)) { - return make_int (DEVICE_X_DEPTH (decode_x_device (device))); + return make_fixnum (DEVICE_X_DEPTH (decode_x_device (device))); } static Lisp_Object @@ -1747,17 +1747,17 @@ switch (m) { case DM_size_device: - return Fcons (make_int (DisplayWidth (dpy, DefaultScreen (dpy))), - make_int (DisplayHeight (dpy, DefaultScreen (dpy)))); + return Fcons (make_fixnum (DisplayWidth (dpy, DefaultScreen (dpy))), + make_fixnum (DisplayHeight (dpy, DefaultScreen (dpy)))); case DM_size_device_mm: - return Fcons (make_int (DisplayWidthMM (dpy, DefaultScreen (dpy))), - make_int (DisplayHeightMM (dpy, DefaultScreen (dpy)))); + return Fcons (make_fixnum (DisplayWidthMM (dpy, DefaultScreen (dpy))), + make_fixnum (DisplayHeightMM (dpy, DefaultScreen (dpy)))); case DM_num_bit_planes: - return make_int (DisplayPlanes (dpy, DefaultScreen (dpy))); + return make_fixnum (DisplayPlanes (dpy, DefaultScreen (dpy))); case DM_num_color_cells: - return make_int (DisplayCells (dpy, DefaultScreen (dpy))); + return make_fixnum (DisplayCells (dpy, DefaultScreen (dpy))); case DM_num_screens: - return make_int (ScreenCount (dpy)); + return make_fixnum (ScreenCount (dpy)); case DM_backing_store: switch (DoesBackingStore (DefaultScreenOfDisplay (dpy))) { @@ -1798,9 +1798,9 @@ { Display *dpy = get_x_display (device); - return list3 (make_int (ProtocolVersion (dpy)), - make_int (ProtocolRevision (dpy)), - make_int (VendorRelease (dpy))); + return list3 (make_fixnum (ProtocolVersion (dpy)), + make_fixnum (ProtocolRevision (dpy)), + make_fixnum (VendorRelease (dpy))); } DEFUN ("x-valid-keysym-name-p", Fx_valid_keysym_name_p, 1, 1, 0, /*