[Emacs-diffs] Changes to emacs/src/keyboard.c

[Richard M. Stallman]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.699 emacs/src/keyboard.c:1.700
*** emacs/src/keyboard.c:1.699  Fri Jul 19 06:33:44 2002
--- emacs/src/keyboard.c        Sat Jul 20 17:47:00 2002
***************
*** 1202,1225 ****
    else
      {
        Fdiscard_input ();
        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);
  
!   print_error_message (data, stream);
  
    /* 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.  */
--- 1202,1220 ----
    else
      {
        Fdiscard_input ();
+       message_log_maybe_newline ();
        bitch_at_user ();
        stream = Qt;
      }
  
!   /* 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);
  
!   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.  */