comparison src/print.c @ 149:538048ae2ab8 r20-3b1

Import from CVS: tag r20-3b1
author cvs
date Mon, 13 Aug 2007 09:36:16 +0200
parents fe104dbd9147
children 85ec50267440
comparison
equal deleted inserted replaced
148:f659db2a1f73 149:538048ae2ab8
39 #include "emacsfns.h" 39 #include "emacsfns.h"
40 #include "insdel.h" 40 #include "insdel.h"
41 #include "lstream.h" 41 #include "lstream.h"
42 42
43 #endif /* not standalone */ 43 #endif /* not standalone */
44
45 static void print_error_message (Lisp_Object data, Lisp_Object stream);
44 46
45 Lisp_Object Vstandard_output, Qstandard_output; 47 Lisp_Object Vstandard_output, Qstandard_output;
46 48
47 /* The subroutine object for external-debugging-output is kept here 49 /* The subroutine object for external-debugging-output is kept here
48 for the convenience of the debugger. */ 50 for the convenience of the debugger. */
599 { 601 {
600 struct buffer *old = XBUFFER(Fcurrent_buffer()); 602 struct buffer *old = XBUFFER(Fcurrent_buffer());
601 Lisp_Object original, printcharfun, value; 603 Lisp_Object original, printcharfun, value;
602 struct gcpro gcpro1; 604 struct gcpro gcpro1;
603 605
604 print_error_message (obj, Vprin1_to_string_buffer, NULL); 606 print_error_message (obj, Vprin1_to_string_buffer);
605 607
606 set_buffer_internal (XBUFFER (Vprin1_to_string_buffer)); 608 set_buffer_internal (XBUFFER (Vprin1_to_string_buffer));
607 value = Fbuffer_substring (Fpoint_min(Fcurrent_buffer()), 609 value = Fbuffer_substring (Fpoint_min(Fcurrent_buffer()),
608 Fpoint_max(Fcurrent_buffer()), 610 Fpoint_max(Fcurrent_buffer()),
609 Fcurrent_buffer()); 611 Fcurrent_buffer());
617 } 619 }
618 620
619 /* Print an error message for the error DATA 621 /* Print an error message for the error DATA
620 onto Lisp output stream STREAM (suitable for the print functions). */ 622 onto Lisp output stream STREAM (suitable for the print functions). */
621 623
622 print_error_message (data, stream) 624 static void print_error_message (Lisp_Object data, Lisp_Object stream)
623 Lisp_Object data, stream;
624 { 625 {
625 Lisp_Object errname, errmsg, file_error, tail; 626 Lisp_Object errname, errmsg, file_error, tail;
626 struct gcpro gcpro1; 627 struct gcpro gcpro1;
627 int i; 628 int i;
628 629