comparison src/cmdloop.c @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents 6608ceec7cf8
children 489f57a838ef
comparison
equal deleted inserted replaced
184:bcd2674570bf 185:3d6bfa290dbd
275 on the terminal device). */ 275 on the terminal device). */
276 if (!noninteractive && 276 if (!noninteractive &&
277 (!CONSOLEP (Vselected_console) || 277 (!CONSOLEP (Vselected_console) ||
278 CONSOLE_STREAM_P (XCONSOLE (Vselected_console)))) 278 CONSOLE_STREAM_P (XCONSOLE (Vselected_console))))
279 Fkill_emacs (make_int (-1)); 279 Fkill_emacs (make_int (-1));
280 280
281 /* End of -batch run causes exit here. */ 281 /* End of -batch run causes exit here. */
282 if (noninteractive) 282 if (noninteractive)
283 Fkill_emacs (Qt); 283 Fkill_emacs (Qt);
284 284
285 for (;;) 285 for (;;)
415 you broke "command-loop" anyway */ 415 you broke "command-loop" anyway */
416 /* #### not correct with Vselected_console */ 416 /* #### not correct with Vselected_console */
417 XCONSOLE (Vselected_console)->prefix_arg = Qnil; 417 XCONSOLE (Vselected_console)->prefix_arg = Qnil;
418 if (NILP (catch_errors)) 418 if (NILP (catch_errors))
419 Fcommand_loop_1 (); 419 Fcommand_loop_1 ();
420 else 420 else
421 internal_catch (Qtop_level, 421 internal_catch (Qtop_level,
422 cold_load_command_loop, Qnil, 0); 422 cold_load_command_loop, Qnil, 0);
423 goto loop; 423 goto loop;
424 return Qnil; 424 return Qnil;
425 } 425 }
432 Fding (Qnil, Qnil, Qnil); 432 Fding (Qnil, Qnil, Qnil);
433 433
434 if (CONSP (datum) && EQ (XCAR (datum), Qquit)) 434 if (CONSP (datum) && EQ (XCAR (datum), Qquit))
435 /* Don't bother with the message */ 435 /* Don't bother with the message */
436 return (Qt); 436 return (Qt);
437 437
438 message ("Error in command-loop!!"); 438 message ("Error in command-loop!!");
439 Fset (intern ("last-error"), datum); /* #### Better/different name? */ 439 Fset (intern ("last-error"), datum); /* #### Better/different name? */
440 Fsit_for (make_int (2), Qnil); 440 Fsit_for (make_int (2), Qnil);
441 cold_load_command_error (datum, Qnil); 441 cold_load_command_error (datum, Qnil);
442 return (Qt); 442 return (Qt);
559 Vquit_flag = Qnil; 559 Vquit_flag = Qnil;
560 Fdispatch_event (event); 560 Fdispatch_event (event);
561 561
562 if (!was_locked) 562 if (!was_locked)
563 any_console_state (); 563 any_console_state ();
564 #if defined (__SUNPRO_C) || (defined (DEC_ALPHA) && defined (OSF1)) 564 #if defined (__SUNPRO_C) || defined (__SUNPRO_CC) || (defined (DEC_ALPHA) && defined (OSF1))
565 if (0) return Qnil; /* Shut up compiler */ 565 if (0) return Qnil; /* Shut up compiler */
566 #endif 566 #endif
567 } 567 }
568 #ifdef LISP_COMMAND_LOOP 568 #ifdef LISP_COMMAND_LOOP
569 UNGCPRO; 569 UNGCPRO;