Mercurial > hg > xemacs-beta
diff src/menubar-x.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 | 1ccc32a20af4 |
children | fdefd0186b75 |
line wrap: on
line diff
--- a/src/menubar-x.c Thu May 24 06:30:21 2001 +0000 +++ b/src/menubar-x.c Thu May 24 07:51:33 2001 +0000 @@ -173,7 +173,7 @@ Lisp_Object cascade = desc; desc = Fcdr (desc); if (NILP (desc)) - syntax_error ("Keyword in menu lacks a value", cascade); + sferror ("Keyword in menu lacks a value", cascade); val = Fcar (desc); desc = Fcdr (desc); if (EQ (key, Q_included)) @@ -190,14 +190,14 @@ || CHARP (val)) wv->accel = LISP_TO_VOID (val); else - syntax_error ("bad keyboard accelerator", val); + invalid_argument ("bad keyboard accelerator", val); } else if (EQ (key, Q_label)) { /* implement in 21.2 */ } else - syntax_error ("Unknown menu cascade keyword", cascade); + invalid_argument ("Unknown menu cascade keyword", cascade); } if ((!NILP (config_tag) @@ -284,7 +284,7 @@ } else { - syntax_error ("Menu name (first element) must be a string", desc); + sferror ("Menu name (first element) must be a string", desc); } if (deep_p || menubar_root_p) @@ -296,7 +296,7 @@ if (menubar_root_p && NILP (child)) /* the partition */ { if (partition_seen) - syntax_error + sferror ("More than one partition (nil) in menubar description", desc); partition_seen = 1; @@ -321,9 +321,9 @@ wv = NULL; } else if (NILP (desc)) - syntax_error ("nil may not appear in menu descriptions", desc); + sferror ("nil may not appear in menu descriptions", desc); else - syntax_error ("Unrecognized menu descriptor", desc); + sferror ("Unrecognized menu descriptor", desc); menu_item_done: @@ -814,7 +814,7 @@ CHECK_STRING (XCAR (menu_desc)); data = menu_item_descriptor_to_widget_value (menu_desc, POPUP_TYPE, 1, 1); - if (! data) error ("no menu"); + if (! data) signal_error (Qgui_error, "no menu", Qunbound); menu_id = new_lwlib_id (); menu = lw_create_widget ("popup", "popup" /* data->name */, menu_id, data, @@ -1332,7 +1332,7 @@ widget_value *val; if (NILP (f->menubar_data)) - error ("Frame has no menubar."); + invalid_argument ("Frame has no menubar", Qunbound); id = XPOPUP_DATA (f->menubar_data)->id; val = lw_get_all_values (id);