Mercurial > hg > xemacs-beta
diff src/select-gtk.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 | 0784d089fdc9 |
| children | b39c14581166 |
line wrap: on
line diff
--- a/src/select-gtk.c Thu May 24 06:30:21 2001 +0000 +++ b/src/select-gtk.c Thu May 24 07:51:33 2001 +0000 @@ -288,7 +288,7 @@ wait_delaying_user_input (selection_reply_done, 0); if (selection_reply_timed_out) - error ("timed out waiting for reply from selection owner"); + signal_error (Qselection_conversion_error, "timed out waiting for reply from selection owner", Qunbound); unbind_to (speccount, Qnil); @@ -462,17 +462,18 @@ { if (XGetSelectionOwner (display, selection_atom)) /* there is a selection owner */ - signal_error - (Qselection_conversion_error, - Fcons (build_string ("selection owner couldn't convert"), - Fcons (x_atom_to_symbol (d, selection_atom), - actual_type ? - list2 (target_type, x_atom_to_symbol (d, actual_type)) : - list1 (target_type)))); + signal_error (Qselection_conversion_error, + "selection owner couldn't convert", + Fcons (Qunbound, + Fcons (x_atom_to_symbol (d, selection_atom), + actual_type ? + list2 (target_type, + x_atom_to_symbol (d, actual_type)) : + list1 (target_type)))); else - signal_error (Qerror, - list2 (build_string ("no selection"), - x_atom_to_symbol (d, selection_atom))); + signal_error (Qselection_conversion_error, + "no selection", + x_atom_to_symbol (d, selection_atom)); } if (actual_type == DEVICE_XATOM_INCR (d)) @@ -765,10 +766,8 @@ (*(GdkAtom **) data_ret) [i] = symbol_to_gtk_atom (d, XVECTOR_DATA (obj) [i], 0); else - signal_error (Qerror, /* Qselection_error */ - list2 (build_string - ("all elements of the vector must be of the same type"), - obj)); + syntax_error + ("all elements of the vector must be of the same type", obj); } #if 0 /* #### MULTIPLE doesn't work yet */ else if (VECTORP (XVECTOR_DATA (obj) [0])) @@ -784,10 +783,8 @@ { Lisp_Object pair = XVECTOR_DATA (obj) [i]; if (XVECTOR_LENGTH (pair) != 2) - signal_error (Qerror, - list2 (build_string - ("elements of the vector must be vectors of exactly two elements"), - pair)); + syntax_error + ("elements of the vector must be vectors of exactly two elements", pair); (*(GdkAtom **) data_ret) [i * 2] = symbol_to_gtk_atom (d, XVECTOR_DATA (pair) [0], 0); @@ -795,10 +792,8 @@ symbol_to_gtk_atom (d, XVECTOR_DATA (pair) [1], 0); } else - signal_error (Qerror, - list2 (build_string - ("all elements of the vector must be of the same type"), - obj)); + syntax_error + ("all elements of the vector must be of the same type", obj); } #endif else @@ -811,10 +806,8 @@ if (CONSP (XVECTOR_DATA (obj) [i])) *format_ret = 32; else if (!INTP (XVECTOR_DATA (obj) [i])) - signal_error (Qerror, /* Qselection_error */ - list2 (build_string - ("all elements of the vector must be integers or conses of integers"), - obj)); + syntax_error + ("all elements of the vector must be integers or conses of integers", obj); *data_ret = (unsigned char *) xmalloc (*size_ret * (*format_ret/8)); for (i = 0; i < (int) (*size_ret); i++) @@ -827,9 +820,7 @@ } } else - signal_error (Qerror, /* Qselection_error */ - list2 (build_string ("unrecognized selection data"), - obj)); + invalid_argument ("unrecognized selection data", obj); *type_ret = symbol_to_gtk_atom (d, type, 0); }