Mercurial > hg > xemacs-beta

diff src/select.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 c33ae14dd6d0
children 42a86787d173
line wrap: on
line diff
--- a/src/select.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/select.c	Thu May 24 07:51:33 2001 +0000
@@ -154,7 +154,8 @@
   int owned_p = 0;
 
   CHECK_SYMBOL (selection_name);
-  if (NILP (selection_value)) error ("selection-value may not be nil.");
+  if (NILP (selection_value))
+    invalid_argument ("`selection-value' may not be nil", Qunbound);
 
   if (NILP (device))
     device = Fselected_device (Qnil);
@@ -162,8 +163,8 @@
   if (!EQ (how_to_add, Qappend) && !EQ (how_to_add, Qt)
       && !EQ (how_to_add, Qreplace_existing)
       && !EQ (how_to_add, Qreplace_all) && !NILP (how_to_add))
-    error ("how-to-add must be nil, append, replace_all, "
-	   "replace_existing or t.");
+    invalid_constant ("`how-to-add' must be nil, append, replace_all, "
+		      "replace_existing or t", how_to_add);
 
 #ifdef MULE
   if (NILP (data_type))
@@ -226,7 +227,9 @@
 						   Vselection_appender_alist);
 
 	      if (NILP (function))
-		error ("cannot append selections of supplied types.");
+		signal_error (Qinvalid_argument,
+			      "Cannot append selections of supplied types (no function)",
+			      data_type);
 
 	      function = XCDR (function);
 
@@ -237,10 +240,14 @@
 				       selection_value);
 
 	      if (NILP (selection_value))
-		error ("cannot append selections of supplied types.");
+		signal_error (Qinvalid_argument,
+			      "Cannot append selections of supplied types (function returned nil)",
+			      data_type);
 	    }
 	  else
-	    error ("cannot append selections of supplied types.");
+	    signal_error_2 (Qinvalid_argument, "Cannot append selections of supplied types (data type nil and both values not strings)",
+			    XCDR (prev_real_value),
+			    selection_value);
 	}
 
       selection_data = Fcons (data_type, selection_value);
@@ -743,27 +750,27 @@
   DEFSUBR (Fselection_data_type_name);
 
   /* Lisp Functions */
-  defsymbol (&Qselect_convert_in, "select-convert-in");
-  defsymbol (&Qselect_convert_out, "select-convert-out");
-  defsymbol (&Qselect_coerce, "select-coerce");
+  DEFSYMBOL (Qselect_convert_in);
+  DEFSYMBOL (Qselect_convert_out);
+  DEFSYMBOL (Qselect_coerce);
 
   /* X Atoms */
-  defsymbol (&QPRIMARY, "PRIMARY");
-  defsymbol (&QSECONDARY, "SECONDARY");
-  defsymbol (&QSTRING, "STRING");
-  defsymbol (&QINTEGER, "INTEGER");
-  defsymbol (&QCLIPBOARD, "CLIPBOARD");
-  defsymbol (&QTIMESTAMP, "TIMESTAMP");
-  defsymbol (&QTEXT, "TEXT");
-  defsymbol (&QDELETE, "DELETE");
-  defsymbol (&QMULTIPLE, "MULTIPLE");
-  defsymbol (&QINCR, "INCR");
+  DEFSYMBOL (QPRIMARY);
+  DEFSYMBOL (QSECONDARY);
+  DEFSYMBOL (QSTRING);
+  DEFSYMBOL (QINTEGER);
+  DEFSYMBOL (QCLIPBOARD);
+  DEFSYMBOL (QTIMESTAMP);
+  DEFSYMBOL (QTEXT);
+  DEFSYMBOL (QDELETE);
+  DEFSYMBOL (QMULTIPLE);
+  DEFSYMBOL (QINCR);
   defsymbol (&QEMACS_TMP, "_EMACS_TMP_");
-  defsymbol (&QTARGETS, "TARGETS");
-  defsymbol (&QATOM, "ATOM");
+  DEFSYMBOL (QTARGETS);
+  DEFSYMBOL (QATOM);
   defsymbol (&QATOM_PAIR, "ATOM_PAIR");
   defsymbol (&QCOMPOUND_TEXT, "COMPOUND_TEXT");
-  defsymbol (&QNULL, "NULL");
+  DEFSYMBOL (QNULL);
 
   /* Windows formats - these all start with CF_ */
   defsymbol (&QCF_TEXT, "CF_TEXT");
@@ -790,10 +797,10 @@
   defsymbol (&QCF_DSPENHMETAFILE, "CF_DSPENHMETAFILE");
 
   /* Selection strategies */
-  defsymbol (&Qreplace_all, "replace-all");
-  defsymbol (&Qreplace_existing, "replace-existing");
+  DEFSYMBOL (Qreplace_all);
+  DEFSYMBOL (Qreplace_existing);
 
-  DEFERROR_STANDARD (Qselection_conversion_error, Qio_error);
+  DEFERROR_STANDARD (Qselection_conversion_error, Qconversion_error);
 }
 
 void