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

[Richard M. Stallman]

Index: emacs/src/print.c
diff -c emacs/src/print.c:1.180 emacs/src/print.c:1.181
*** emacs/src/print.c:1.180     Fri Jul 19 10:27:16 2002
--- emacs/src/print.c   Sat Jul 20 17:48:27 2002
***************
*** 920,926 ****
        && NILP (XCDR (XCDR (obj))))
      return XCAR (XCDR (obj));
  
!   print_error_message (obj, Vprin1_to_string_buffer);
  
    set_buffer_internal (XBUFFER (Vprin1_to_string_buffer));
    value = Fbuffer_string ();
--- 920,926 ----
        && NILP (XCDR (XCDR (obj))))
      return XCAR (XCDR (obj));
  
!   print_error_message (obj, Vprin1_to_string_buffer, 0, Qnil);
  
    set_buffer_internal (XBUFFER (Vprin1_to_string_buffer));
    value = Fbuffer_string ();
***************
*** 937,948 ****
     STREAM (suitable for the print functions).  */
  
  void
! print_error_message (data, stream)
       Lisp_Object data, stream;
  {
    Lisp_Object errname, errmsg, file_error, tail;
    struct gcpro gcpro1;
    int i;
  
    errname = Fcar (data);
  
--- 937,962 ----
     STREAM (suitable for the print functions).  */
  
  void
! print_error_message (data, stream, context, caller)
       Lisp_Object data, stream;
+      char *context;
+      Lisp_Object caller;
  {
    Lisp_Object errname, errmsg, file_error, tail;
    struct gcpro gcpro1;
    int i;
+ 
+   if (context != 0)
+     write_string_1 (context, -1, stream);
+ 
+   /* If we know from where the error was signaled, show it in
+    *Messages*.  */
+   if (!NILP (caller) && SYMBOLP (caller))
+     {
+       const char *name = SDATA (SYMBOL_NAME (caller));
+       message_dolog (name, strlen (name), 0, 0);
+       message_dolog (": ", 2, 0, 0);
+     }
  
    errname = Fcar (data);