From dc4854ce115eeb86201afb4905c4f5e845988343 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 20 Jul 2002 21:47:00 +0000 Subject: [PATCH] (cmd_error_internal): Pass Vsignaling_function and CONTEXT to print_error_message, don't print them here. For a Quit, don't use Vsignaling_function. Call message_log_maybe_newline. --- src/keyboard.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/keyboard.c b/src/keyboard.c index e2f2b74cd6b..0647d532867 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1202,24 +1202,19 @@ cmd_error_internal (data, context) else { Fdiscard_input (); + message_log_maybe_newline (); bitch_at_user (); stream = Qt; - - /* If we know from where the error was signaled, show it in - *Messages*. */ - if (!NILP (Vsignaling_function) && SYMBOLP (Vsignaling_function)) - { - const char *name = SDATA (SYMBOL_NAME (Vsignaling_function)); - message_dolog (name, strlen (name), 0, 0); - message_dolog (": ", 2, 0, 0); - Vsignaling_function = Qnil; - } } - if (context != 0) - write_string_1 (context, -1, stream); + /* The immediate context is not interesting for Quits, + since they are asyncronous. */ + if (EQ (XCAR (data), Qquit)) + Vsignaling_function = Qnil; + + print_error_message (data, stream, context, Vsignaling_function); - print_error_message (data, stream); + Vsignaling_function = Qnil; /* If the window system or terminal frame hasn't been initialized yet, or we're in -batch mode, this error should cause Emacs to exit. */ -- 2.39.5