Mercurial > hg > xemacs-beta

diff src/tooltalk.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 576fb035e263
children 6db80f4ab17c
line wrap: on
line diff
--- a/src/tooltalk.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/tooltalk.c	Thu May 24 07:51:33 2001 +0000
@@ -167,8 +167,8 @@
   char buf[200];
 
   if (print_readably)
-    error ("printing unreadable object #<tooltalk_message 0x%x>",
-	   p->header.uid);
+    printing_unreadable_object ("#<tooltalk_message 0x%x>",
+				p->header.uid);
 
   sprintf (buf, "#<tooltalk_message id:0x%lx 0x%x>", (long) (p->m), p->header.uid);
   write_c_string (buf, printcharfun);
@@ -240,8 +240,8 @@
   char buf[200];
 
   if (print_readably)
-    error ("printing unreadable object #<tooltalk_pattern 0x%x>",
-	   p->header.uid);
+    printing_unreadable_object ("#<tooltalk_pattern 0x%x>",
+				p->header.uid);
 
   sprintf (buf, "#<tooltalk_pattern id:0x%lx 0x%x>", (long) (p->p), p->header.uid);
   write_c_string (buf, printcharfun);
@@ -300,8 +300,12 @@
 check_status (Tt_status st)
 {
   if (tt_is_err (st))
-    signal_error (Qtooltalk_error,
-		  Fcons (build_string (tt_status_message (st)), Qnil));
+    {
+      Bufbyte *err;
+
+      EXTERNAL_TO_C_STRING (tt_status_message (st), err, Qnative);
+      signal_error (Qtooltalk_error, err, Qunbound);
+    }
 }
 
 DEFUN ("receive-tooltalk-message", Freceive_tooltalk_message, 0, 2, 0, /*
@@ -672,7 +676,7 @@
 			   (XTOOLTALK_MESSAGE (message_)->plist_sym));
 
   else
-    signal_simple_error ("Invalid value for `get-tooltalk-message-attribute'",
+    invalid_constant ("Invalid value for `get-tooltalk-message-attribute'",
 			 attribute);
 
   return Qnil;
@@ -792,7 +796,7 @@
       return Fput (XTOOLTALK_MESSAGE (message_)->plist_sym, argn, value);
     }
   else
-    signal_simple_error ("Invalid value for `set-tooltalk-message-attribute'",
+    invalid_constant ("Invalid value for `set-tooltalk-message-attribute'",
 			 attribute);
 
   if (fun_str)
@@ -1291,9 +1295,9 @@
        ())
 {
   if (!NILP (Vtooltalk_fd))
-    error ("Already connected to ToolTalk.");
+    signal_error (Qio_error, "Already connected to ToolTalk", Qunbound);
   if (noninteractive)
-    error ("Can't connect to ToolTalk in batch mode.");
+    signal_error (Qio_error, "Can't connect to ToolTalk in batch mode", Qunbound);
   init_tooltalk ();
   return NILP (Vtooltalk_fd) ? Qnil : Qt;
 }
@@ -1305,14 +1309,13 @@
   INIT_LRECORD_IMPLEMENTATION (tooltalk_message);
   INIT_LRECORD_IMPLEMENTATION (tooltalk_pattern);
 
-  defsymbol (&Qtooltalk_messagep, "tooltalk-message-p");
+  DEFSYMBOL_MULTIWORD_PREDICATE (Qtooltalk_messagep);
   DEFSUBR (Ftooltalk_message_p);
-  defsymbol (&Qtooltalk_patternp, "tooltalk-pattern-p");
+  DEFSYMBOL_MULTIWORD_PREDICATE (Qtooltalk_patternp);
   DEFSUBR (Ftooltalk_pattern_p);
-  defsymbol (&Qtooltalk_message_handler_hook, "tooltalk-message-handler-hook");
-  defsymbol (&Qtooltalk_pattern_handler_hook, "tooltalk-pattern-handler-hook");
-  defsymbol (&Qtooltalk_unprocessed_message_hook,
-	     "tooltalk-unprocessed-message-hook");
+  DEFSYMBOL (Qtooltalk_message_handler_hook);
+  DEFSYMBOL (Qtooltalk_pattern_handler_hook);
+  DEFSYMBOL (Qtooltalk_unprocessed_message_hook);
 
   DEFSUBR (Freceive_tooltalk_message);
   DEFSUBR (Fcreate_tooltalk_message);
@@ -1335,7 +1338,7 @@
   DEFSUBR (Ftooltalk_default_session);
   DEFSUBR (Ftooltalk_open_connection);
 
-  defsymbol (&Qreceive_tooltalk_message, "receive-tooltalk-message");
+  DEFSYMBOL (Qreceive_tooltalk_message);
   defsymbol (&Qtt_address, "address");
   defsymbol (&Qtt_args_count, "args_count");
   defsymbol (&Qtt_arg_bval, "arg_bval");