Mercurial > hg > xemacs-beta
diff src/toolbar-msw.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 | 308d34e9f07d |
| children | 68639fb08af8 |
line wrap: on
line diff
--- a/src/toolbar-msw.c Sat Oct 08 12:26:09 2011 +0100 +++ b/src/toolbar-msw.c Sun Oct 09 09:51:57 2011 +0100 @@ -65,7 +65,7 @@ { /* hmm what do we generate an id based on */ int id = TOOLBAR_ITEM_ID_BITS (internal_hash (button->callback, 0, 0)); - while (!NILP (Fgethash (make_int (id), + while (!NILP (Fgethash (make_fixnum (id), FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil))) { id = TOOLBAR_ITEM_ID_BITS (id + 1); @@ -90,7 +90,7 @@ { qxeSendMessage (toolbarwnd, TB_GETBUTTON, (WPARAM) i, (LPARAM) &info); - Fremhash (make_int (info.idCommand), + Fremhash (make_fixnum (info.idCommand), FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f)); qxeSendMessage (toolbarwnd, TB_DELETEBUTTON, (WPARAM) i, 0); } @@ -321,7 +321,7 @@ } } - Fputhash (make_int (tbbutton->idCommand), + Fputhash (make_fixnum (tbbutton->idCommand), button, FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f)); } @@ -563,7 +563,7 @@ Lisp_Object mswindows_get_toolbar_button_text (struct frame *f, int command_id) { - Lisp_Object button = Fgethash (make_int (command_id), + Lisp_Object button = Fgethash (make_fixnum (command_id), FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil); if (!NILP (button)) @@ -587,7 +587,7 @@ /* Try to map the command id through the proper hash table */ Lisp_Object button, data, fn, arg, frame; - button = Fgethash (make_int (id), + button = Fgethash (make_fixnum (id), FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f), Qnil); if (NILP (button))