Mercurial > hg > xemacs-beta

comparison src/cmdloop.c @ 5581:56144c8593a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
162 #if defined (HAVE_MS_WINDOWS) && defined (WIN32_NATIVE) 162 #if defined (HAVE_MS_WINDOWS) && defined (WIN32_NATIVE)
163 /* Don't do this under Cygwin, since we have output on stderr. */ 163 /* Don't do this under Cygwin, since we have output on stderr. */
164 Fmswindows_message_box (build_msg_string ("Initialization error"), 164 Fmswindows_message_box (build_msg_string ("Initialization error"),
165 Qnil, Qnil); 165 Qnil, Qnil);
166 #endif 166 #endif
167 Fkill_emacs (make_int (-1)); 167 Fkill_emacs (make_fixnum (-1));
168 RETURN_NOT_REACHED (Qnil); 168 RETURN_NOT_REACHED (Qnil);
169 } 169 }
170 170
171 171
172 /**********************************************************************/ 172 /**********************************************************************/
247 #if 1 247 #if 1
248 else 248 else
249 { 249 {
250 message ("\ntemacs can only be run in -batch mode."); 250 message ("\ntemacs can only be run in -batch mode.");
251 noninteractive = 1; /* prevent things under kill-emacs from blowing up */ 251 noninteractive = 1; /* prevent things under kill-emacs from blowing up */
252 Fkill_emacs (make_int (-1)); 252 Fkill_emacs (make_fixnum (-1));
253 } 253 }
254 #else 254 #else
255 else if (purify_flag) 255 else if (purify_flag)
256 message ("Bare impure Emacs (standard Lisp code not loaded)"); 256 message ("Bare impure Emacs (standard Lisp code not loaded)");
257 else 257 else
319 wasn't created, then die now (the error was already printed out 319 wasn't created, then die now (the error was already printed out
320 on the terminal device). */ 320 on the terminal device). */
321 if (!noninteractive && 321 if (!noninteractive &&
322 (!CONSOLEP (Vselected_console) || 322 (!CONSOLEP (Vselected_console) ||
323 CONSOLE_STREAM_P (XCONSOLE (Vselected_console)))) 323 CONSOLE_STREAM_P (XCONSOLE (Vselected_console))))
324 Fkill_emacs (make_int (-1)); 324 Fkill_emacs (make_fixnum (-1));
325 325
326 /* End of -batch run causes exit here. */ 326 /* End of -batch run causes exit here. */
327 if (noninteractive) 327 if (noninteractive)
328 Fkill_emacs (Qt); 328 Fkill_emacs (Qt);
329 329
479 /* Don't bother with the message */ 479 /* Don't bother with the message */
480 return (Qt); 480 return (Qt);
481 481
482 message ("Error in command-loop!!"); 482 message ("Error in command-loop!!");
483 Fset (intern ("last-error"), datum); /* #### Better/different name? */ 483 Fset (intern ("last-error"), datum); /* #### Better/different name? */
484 Fsit_for (make_int (2), Qnil); 484 Fsit_for (make_fixnum (2), Qnil);
485 cold_load_command_error (datum, Qnil); 485 cold_load_command_error (datum, Qnil);
486 return (Qt); 486 return (Qt);
487 } 487 }
488 488
489 DOESNT_RETURN 489 DOESNT_RETURN
492 /* This function can GC */ 492 /* This function can GC */
493 if (!NILP (load_me)) 493 if (!NILP (load_me))
494 { 494 {
495 if (!NILP (condition_case_1 (Qt, load1, load_me, 495 if (!NILP (condition_case_1 (Qt, load1, load_me,
496 initial_error_handler, Qnil))) 496 initial_error_handler, Qnil)))
497 Fkill_emacs (make_int (-1)); 497 Fkill_emacs (make_fixnum (-1));
498 } 498 }
499 499
500 for (;;) 500 for (;;)
501 { 501 {
502 command_loop_level = 0; 502 command_loop_level = 0;
566 /* This magically makes single character keyboard macros work just 566 /* This magically makes single character keyboard macros work just
567 like the real thing. This is slightly bogus, but it's in here for 567 like the real thing. This is slightly bogus, but it's in here for
568 compatibility with Emacs 18. It's not even clear what the "right 568 compatibility with Emacs 18. It's not even clear what the "right
569 thing" is. */ 569 thing" is. */
570 if (!((STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro)) 570 if (!((STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro))
571 && XINT (Flength (Vexecuting_macro)) == 1)) 571 && XFIXNUM (Flength (Vexecuting_macro)) == 1))
572 Vlast_command = Qt; 572 Vlast_command = Qt;
573 573
574 #ifndef LISP_COMMAND_LOOP 574 #ifndef LISP_COMMAND_LOOP
575 while (1) 575 while (1)
576 #else 576 #else
611 rather than quitting back to the minibuffer. */ 611 rather than quitting back to the minibuffer. */
612 int count = begin_dont_check_for_quit (); 612 int count = begin_dont_check_for_quit ();
613 if (!NILP (Vminibuffer_echo_wait_function)) 613 if (!NILP (Vminibuffer_echo_wait_function))
614 call0 (Vminibuffer_echo_wait_function); 614 call0 (Vminibuffer_echo_wait_function);
615 else 615 else
616 Fsit_for (make_int (2), Qnil); 616 Fsit_for (make_fixnum (2), Qnil);
617 clear_echo_area (selected_frame (), Qnil, 0); 617 clear_echo_area (selected_frame (), Qnil, 0);
618 Vquit_flag = Qnil; /* see begin_dont_check_for_quit() */ 618 Vquit_flag = Qnil; /* see begin_dont_check_for_quit() */
619 unbind_to (count); 619 unbind_to (count);
620 } 620 }
621 621