Mercurial > hg > xemacs-beta

diff src/print.c @ 563:183866b06e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents 1ccc32a20af4
children 4326eeed6933
line wrap: on
line diff
--- a/src/print.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/print.c	Thu May 24 07:51:33 2001 +0000
@@ -784,7 +784,12 @@
     while (!NILP (tail))
       {
 	write_c_string (first ? ": " : ", ", stream);
-	print_internal (Fcar (tail), stream, 1);
+	/* Most errors have an explanatory string as their first argument,
+	   and it looks better not to put the quotes around it. */
+	print_internal (Fcar (tail), stream,
+			!(first && STRINGP (Fcar (tail))) ||
+			!NILP (Fget (type, Qerror_lacks_explanatory_string,
+				     Qnil)));
 	tail = Fcdr (tail);
 	first = 0;
       }
@@ -1062,7 +1067,7 @@
 	if (EQ (obj, tortoise) && len > 0)
 	  {
 	    if (print_readably)
-	      error ("printing unreadable circular list");
+	      printing_unreadable_object ("circular list");
 	    else
 	      write_c_string ("... <circular list>", printcharfun);
 	    break;
@@ -1176,9 +1181,10 @@
   char buf[200];
 
   if (print_readably)
-    error ("printing unreadable object #<%s 0x%x>",
-	   LHEADER_IMPLEMENTATION (&header->lheader)->name,
-	   header->uid);
+    printing_unreadable_object
+      ("#<%s 0x%x>",
+       LHEADER_IMPLEMENTATION (&header->lheader)->name,
+       header->uid);
 
   sprintf (buf, "#<%s 0x%x>",
 	   LHEADER_IMPLEMENTATION (&header->lheader)->name,
@@ -1239,7 +1245,7 @@
   print_depth++;
 
   if (print_depth > PRINT_CIRCLE)
-    error ("Apparently circular structure being printed");
+    signal_error (Qstack_overflow, "Apparently circular structure being printed", Qunbound);
 
   switch (XTYPE (obj))
     {
@@ -1355,8 +1361,8 @@
 	char buf[128];
 	/* We're in trouble if this happens! */
 	if (print_readably)
-	  error ("printing illegal data type #o%03o",
-		 (int) XTYPE (obj));
+	  ty(e_error (Qinternal_error, "printing illegal data type #o%03o",
+		      (int) XTYPE (obj));
 	write_c_string ("#<EMACS BUG: ILLEGAL DATATYPE ",
 			printcharfun);
 	sprintf (buf, "(#o%3o)", (int) XTYPE (obj));
@@ -1578,7 +1584,7 @@
       CHECK_LIVE_DEVICE (device);
       if (!DEVICE_TTY_P (XDEVICE (device)) &&
 	  !DEVICE_STREAM_P (XDEVICE (device)))
-	signal_simple_error ("Must be tty or stream device", device);
+	wtaerror ("Must be tty or stream device", device);
       con = XCONSOLE (DEVICE_CONSOLE (XDEVICE (device)));
       if (DEVICE_TTY_P (XDEVICE (device)))
 	file = 0;
@@ -1624,7 +1630,7 @@
       filename = Fexpand_file_name (filename, Qnil);
       termscript = fopen ((char *) XSTRING_DATA (filename), "w");
       if (termscript == NULL)
-	report_file_error ("Opening termscript", list1 (filename));
+	report_file_error ("Opening termscript", filename);
     }
   return Qnil;
 }
@@ -1770,14 +1776,14 @@
 void
 syms_of_print (void)
 {
-  defsymbol (&Qstandard_output, "standard-output");
+  DEFSYMBOL (Qstandard_output);
 
-  defsymbol (&Qprint_length, "print-length");
+  DEFSYMBOL (Qprint_length);
 
-  defsymbol (&Qprint_string_length, "print-string-length");
+  DEFSYMBOL (Qprint_string_length);
 
-  defsymbol (&Qdisplay_error, "display-error");
-  defsymbol (&Qprint_message_label, "print-message-label");
+  DEFSYMBOL (Qdisplay_error);
+  DEFSYMBOL (Qprint_message_label);
 
   DEFSUBR (Fprin1);
   DEFSUBR (Fprin1_to_string);
@@ -1790,10 +1796,10 @@
   DEFSUBR (Falternate_debugging_output);
   DEFSUBR (Fexternal_debugging_output);
   DEFSUBR (Fopen_termscript);
-  defsymbol (&Qexternal_debugging_output, "external-debugging-output");
-  defsymbol (&Qalternate_debugging_output, "alternate-debugging-output");
+  DEFSYMBOL (Qexternal_debugging_output);
+  DEFSYMBOL (Qalternate_debugging_output);
 #ifdef HAVE_MS_WINDOWS
-  defsymbol (&Qmswindows_debugging_output, "mswindows-debugging-output");
+  DEFSYMBOL (Qmswindows_debugging_output);
 #endif
   DEFSUBR (Fwith_output_to_temp_buffer);
 }