Mercurial > hg > xemacs-beta
diff src/console.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 | 3d1f8f0e690f |
| children |
line wrap: on
line diff
--- a/src/console.c Sat Oct 08 12:26:09 2011 +0100 +++ b/src/console.c Sun Oct 09 09:51:57 2011 +0100 @@ -704,7 +704,7 @@ { int down_we_go = 0; - if ((XINT (Flength (Vconsole_list)) == 1) + if ((XFIXNUM (Flength (Vconsole_list)) == 1) /* if we just created the console, it might not be listed, or something ... */ && !NILP (memq_no_quit (console, Vconsole_list))) @@ -724,7 +724,7 @@ stderr_out (" Autosaving and exiting...\n"); Vwindow_system = Qnil; /* let it lie! */ preparing_for_armageddon = 1; - Fkill_emacs (make_int (70)); + Fkill_emacs (make_fixnum (70)); } else { @@ -1054,7 +1054,7 @@ } reset_one_console (con); event_stream_unselect_console (con); - sys_suspend_process (XINT (Fconsole_tty_controlling_process (console))); + sys_suspend_process (XFIXNUM (Fconsole_tty_controlling_process (console))); } #endif /* HAVE_TTY */ @@ -1436,11 +1436,11 @@ * #### We don't currently ever reset console variables, so there * is no current distinction between 0 and -1, and between -2 and -3. */ - Lisp_Object always_local_resettable = make_int (-1); + Lisp_Object always_local_resettable = make_fixnum (-1); #if 0 /* not used */ - Lisp_Object always_local_no_default = make_int (0); - Lisp_Object resettable = make_int (-3); + Lisp_Object always_local_no_default = make_fixnum (0); + Lisp_Object resettable = make_fixnum (-3); #endif /* Assign the local-flags to the slots that have default values. @@ -1451,7 +1451,7 @@ set_lheader_implementation ((struct lrecord_header *) &console_local_flags, &lrecord_console); - nuke_all_console_slots (&console_local_flags, make_int (-2)); + nuke_all_console_slots (&console_local_flags, make_fixnum (-2)); console_local_flags.defining_kbd_macro = always_local_resettable; console_local_flags.last_kbd_macro = always_local_resettable; console_local_flags.prefix_arg = always_local_resettable; @@ -1462,10 +1462,10 @@ console_local_flags.tty_erase_char = always_local_resettable; #endif - console_local_flags.function_key_map = make_int (1); + console_local_flags.function_key_map = make_fixnum (1); /* #### Warning, 0x4000000 (that's six zeroes) is the largest number - currently allowable due to the XINT() handling of this value. + currently allowable due to the XFIXNUM() handling of this value. With some rearrangement you can get 4 more bits. */ } } @@ -1607,8 +1607,8 @@ slot of console_local_flags and vice-versa. Must be done after all DEFVAR_CONSOLE_LOCAL() calls. */ #define MARKED_SLOT(slot) \ - assert ((XINT (console_local_flags.slot) != -2 && \ - XINT (console_local_flags.slot) != -3) \ + assert ((XFIXNUM (console_local_flags.slot) != -2 && \ + XFIXNUM (console_local_flags.slot) != -3) \ == !(NILP (XCONSOLE (Vconsole_local_symbols)->slot))); #include "conslots.h" }