diff src/menubar-msw.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 abe6d1db359e
children 5fd7ba8b56e7
line wrap: on
line diff
--- a/src/menubar-msw.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/menubar-msw.c	Thu May 24 07:51:33 2001 +0000
@@ -150,7 +150,7 @@
   while ((ptr = (Bufbyte *) memchr (ptr, '&', len - (ptr - item))) != NULL)
     {
       if (len + 2 > maxlen)
-	syntax_error ("Menu item produces too long displayable string",
+	invalid_argument ("Menu item produces too long displayable string",
 		      error_name);
       memmove (ptr + 1, ptr, (len - (ptr - item)) + 1);
       len++;
@@ -194,7 +194,7 @@
     {
       /* Force a default accelerator */
       if (len + 2 > maxlen)
-	syntax_error ("Menu item produces too long displayable string",
+	invalid_argument ("Menu item produces too long displayable string",
 		      error_name);
       ptr = item;
       memmove (ptr + 1, ptr, len + 1);
@@ -373,7 +373,7 @@
       menu_parse_submenu_keywords (item, gui_item);
 
       if (!STRINGP (pgui_item->name))
-	syntax_error ("Menu name (first element) must be a string",
+	invalid_argument ("Menu name (first element) must be a string",
 			     item);
 
       if (!gui_item_included_p (gui_item, Vmenubar_configuration))
@@ -479,7 +479,7 @@
       UNGCPRO;
     }
   else
-    syntax_error ("Malformed menu item descriptor", item);
+    sferror ("Malformed menu item descriptor", item);
 
   if (flush_right)
     item_info.fType |= MFT_RIGHTJUSTIFY; /* can't support in 3.51 */
@@ -534,7 +534,7 @@
 
   /* Check that menu name is specified when expected */
   if (NILP (pgui_item->name) && deep_p)
-    syntax_error ("Menu must have a name", desc);
+    sferror ("Menu must have a name", desc);
 
   /* Apply filter if specified */
   if (!NILP (pgui_item->filter))
@@ -744,14 +744,14 @@
 #ifdef DEBUG_XEMACS
   /* Allow to continue in a debugger after assert - not so fatal */
   if (UNBOUNDP (path))
-    error ("internal menu error");
+    signal_error (Qinternal_error, "internal menu error", Qunbound);
 #endif
 
   /* Now find a desc chunk for it. If none, then probably menu open
      hook has played too much games around stuff */
   desc = Fmenu_find_real_submenu (current_menudesc, path);
   if (NILP (desc))
-    signal_simple_error ("This menu does not exist any more", path);
+    invalid_state ("This menu does not exist any more", path);
 
   /* Now, stuff it */
   /* DESC may be generated by filter, so we have to gcpro it */
@@ -956,8 +956,8 @@
   if (!ok)
     {
       menu_cleanup (f);
-      signal_simple_error ("Cannot track popup menu while in menu",
-			   menu_desc);
+      invalid_operation ("Cannot track popup menu while in menu",
+			 menu_desc);
     }
   UNGCPRO;
 }