diff src/macros.c @ 563:183866b06e0b

[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 943eaba38521
line wrap: on
line diff
--- a/src/macros.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/macros.c	Thu May 24 07:51:33 2001 +0000
@@ -62,7 +62,7 @@
   /* This function can GC */
   struct console *con = XCONSOLE (Vselected_console);
   if (!NILP (con->defining_kbd_macro))
-      error ("Already defining kbd macro");
+      invalid_operation ("Already defining kbd macro", Qunbound);
 
   if (NILP (con->kbd_macro_builder))
     con->kbd_macro_builder = make_vector (30, Qnil);
@@ -105,7 +105,7 @@
   int repeat;
 
   if (NILP (con->defining_kbd_macro))
-    error ("Not defining kbd macro");
+    invalid_operation ("Not defining kbd macro", Qunbound);
 
   if (NILP (arg))
     repeat = -1;
@@ -193,7 +193,7 @@
     }
   else if (!EQ (Vexecuting_macro, Qt)) /* Some things replace the macro
 					  with Qt to force an early exit. */
-    error ("junk in executing-macro");
+    signal_error (Qinvalid_state, "junk in executing-macro", Qunbound);
 
   Fthrow (Qexecute_kbd_macro, Qt);
 }
@@ -234,9 +234,9 @@
   struct console *con = XCONSOLE (Vselected_console);
 
   if (!NILP (con->defining_kbd_macro))
-    error ("Can't execute anonymous macro while defining one");
+    invalid_operation ("Can't execute anonymous macro while defining one", Qunbound);
   else if (NILP (con->last_kbd_macro))
-    error ("No kbd macro has been defined");
+    invalid_operation ("No kbd macro has been defined", Qunbound);
   else
     Fexecute_kbd_macro (con->last_kbd_macro, prefix);
   return Qnil;
@@ -275,7 +275,7 @@
 
   final = indirect_function (macro, 1);
   if (!STRINGP (final) && !VECTORP (final))
-    error ("Keyboard macros must be strings or vectors");
+    invalid_argument ("Keyboard macros must be strings or vectors", Qunbound);
 
   tem = Fcons (Vexecuting_macro, make_int (executing_macro_index));
   record_unwind_protect (pop_kbd_macro, tem);
@@ -307,7 +307,7 @@
   DEFSUBR (Fcall_last_kbd_macro);
   DEFSUBR (Fexecute_kbd_macro);
   DEFSUBR (Fcancel_kbd_macro_events);
-  defsymbol (&Qexecute_kbd_macro, "execute-kbd-macro");
+  DEFSYMBOL (Qexecute_kbd_macro);
 }
 
 void