diff src/cmdloop.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
line wrap: on
line diff
--- a/src/cmdloop.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/cmdloop.c	Sun Oct 09 09:51:57 2011 +0100
@@ -164,7 +164,7 @@
   Fmswindows_message_box (build_msg_string ("Initialization error"),
 			  Qnil, Qnil);
 #endif
-  Fkill_emacs (make_int (-1));
+  Fkill_emacs (make_fixnum (-1));
   RETURN_NOT_REACHED (Qnil);
 }
 
@@ -249,7 +249,7 @@
     {
       message ("\ntemacs can only be run in -batch mode.");
       noninteractive = 1; /* prevent things under kill-emacs from blowing up */
-      Fkill_emacs (make_int (-1));
+      Fkill_emacs (make_fixnum (-1));
     }
 #else
   else if (purify_flag)
@@ -321,7 +321,7 @@
   if (!noninteractive &&
       (!CONSOLEP (Vselected_console) ||
        CONSOLE_STREAM_P (XCONSOLE (Vselected_console))))
-    Fkill_emacs (make_int (-1));
+    Fkill_emacs (make_fixnum (-1));
 
   /* End of -batch run causes exit here. */
   if (noninteractive)
@@ -481,7 +481,7 @@
 
   message ("Error in command-loop!!");
   Fset (intern ("last-error"), datum); /* #### Better/different name? */
-  Fsit_for (make_int (2), Qnil);
+  Fsit_for (make_fixnum (2), Qnil);
   cold_load_command_error (datum, Qnil);
   return (Qt);
 }
@@ -494,7 +494,7 @@
     {
       if (!NILP (condition_case_1 (Qt, load1, load_me,
                                    initial_error_handler, Qnil)))
-	Fkill_emacs (make_int (-1));
+	Fkill_emacs (make_fixnum (-1));
     }
 
   for (;;)
@@ -568,7 +568,7 @@
      compatibility with Emacs 18.  It's not even clear what the "right
      thing" is. */
   if (!((STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))
-	&& XINT (Flength (Vexecuting_macro)) == 1))
+	&& XFIXNUM (Flength (Vexecuting_macro)) == 1))
     Vlast_command = Qt;
 
 #ifndef LISP_COMMAND_LOOP
@@ -613,7 +613,7 @@
 	  if (!NILP (Vminibuffer_echo_wait_function))
 	    call0 (Vminibuffer_echo_wait_function);
 	  else
-	    Fsit_for (make_int (2), Qnil);
+	    Fsit_for (make_fixnum (2), Qnil);
 	  clear_echo_area (selected_frame (), Qnil, 0);
 	  Vquit_flag = Qnil; /* see begin_dont_check_for_quit() */
 	  unbind_to (count);