Mercurial > hg > xemacs-beta
diff src/frame-gtk.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 | 4dee0387b9de |
| children |
line wrap: on
line diff
--- a/src/frame-gtk.c Sat Oct 08 12:26:09 2011 +0100 +++ b/src/frame-gtk.c Sun Oct 09 09:51:57 2011 +0100 @@ -245,8 +245,8 @@ if (!GET_GTK_WIDGET_WINDOW(shell)) return Qzero; gdk_window_get_deskrelative_origin (GET_GTK_WIDGET_WINDOW (shell), &x, &y); - if (EQ (Qleft, property)) return make_int (x); - if (EQ (Qtop, property)) return make_int (y); + if (EQ (Qleft, property)) return make_fixnum (x); + if (EQ (Qtop, property)) return make_fixnum (y); } if (EQ (Qshell_widget, property)) { @@ -300,8 +300,8 @@ else gdk_window_get_deskrelative_origin (GET_GTK_WIDGET_WINDOW (shell), &x, &y); - props = cons3 (Qtop, make_int (y), props); - props = cons3 (Qleft, make_int (x), props); + props = cons3 (Qtop, make_fixnum (y), props); + props = cons3 (Qleft, make_fixnum (x), props); return props; } @@ -428,30 +428,30 @@ } else if (EQ (prop, Qwidth)) { - CHECK_INT (val); - width = XINT (val); + CHECK_FIXNUM (val); + width = XFIXNUM (val); width_specified_p = TRUE; continue; } else if (EQ (prop, Qheight)) { - CHECK_INT (val); - height = XINT (val); + CHECK_FIXNUM (val); + height = XFIXNUM (val); height_specified_p = TRUE; continue; } /* Further kludge the x/y. */ else if (EQ (prop, Qx)) { - CHECK_INT (val); - x = (gint) XINT (val); + CHECK_FIXNUM (val); + x = (gint) XFIXNUM (val); x_position_specified_p = TRUE; continue; } else if (EQ (prop, Qy)) { - CHECK_INT (val); - y = (gint) XINT (val); + CHECK_FIXNUM (val); + y = (gint) XFIXNUM (val); y_position_specified_p = TRUE; continue; } @@ -491,13 +491,13 @@ { Lisp_Object frame = wrap_frame (f); - Fset_frame_size (frame, make_int (width), make_int (height), Qnil); + Fset_frame_size (frame, make_fixnum (width), make_fixnum (height), Qnil); } if (position_specified_p) { Lisp_Object frame = wrap_frame (f); - Fset_frame_position (frame, make_int (x), make_int (y)); + Fset_frame_position (frame, make_fixnum (x), make_fixnum (y)); } } }