Mercurial > hg > xemacs-beta

diff src/extents.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 20ae8821c23d
children b39c14581166
line wrap: on
line diff
--- a/src/extents.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/extents.c	Thu May 24 07:51:33 2001 +0000
@@ -3026,9 +3026,9 @@
       if (print_readably)
 	{
 	  if (!EXTENT_LIVE_P (XEXTENT (obj)))
-	    error ("printing unreadable object #<destroyed extent>");
+	    printing_unreadable_object ("#<destroyed extent>");
 	  else
-	    error ("printing unreadable object #<extent 0x%lx>",
+	    printing_unreadable_object ("#<extent 0x%lx>",
 		   (long) XEXTENT (obj));
 	}
 
@@ -3049,7 +3049,7 @@
   else
     {
       if (print_readably)
-	error ("printing unreadable object #<extent>");
+	printing_unreadable_object ("#<extent>");
       write_c_string ("#<extent", printcharfun);
     }
   write_c_string (">", printcharfun);
@@ -3536,7 +3536,7 @@
     return Qnil;
   for (rest = parent; !NILP (rest); rest = extent_parent (XEXTENT (rest)))
     if (EQ (rest, extent))
-      signal_type_error (Qinvalid_change,
+      signal_error (Qinvalid_change,
 			 "Circular parent chain would result",
 			 extent);
   if (NILP (parent))
@@ -3877,7 +3877,7 @@
 	  EQ (sym, Qall_extents_open_closed))
 	{
 	  if (all_extents_specified)
-	    error ("Only one `all-extents-*' flag may be specified");
+	    invalid_argument ("Only one `all-extents-*' flag may be specified", Qunbound);
 	  all_extents_specified = 1;
 	}
       if (EQ (sym, Qstart_in_region) || EQ (sym, Qend_in_region) ||
@@ -3885,7 +3885,7 @@
 	  EQ (sym, Qstart_or_end_in_region))
 	{
 	  if (in_region_specified)
-	    error ("Only one `*-in-region' flag may be specified");
+	    invalid_argument ("Only one `*-in-region' flag may be specified", Qunbound);
 	  in_region_specified = 1;
 	}
 
@@ -3902,7 +3902,7 @@
 	EQ (sym, Qstart_and_end_in_region) ? ME_START_AND_END_IN_REGION :
 	EQ (sym, Qstart_or_end_in_region)  ? ME_START_OR_END_IN_REGION :
 	EQ (sym, Qnegate_in_region)	   ? ME_NEGATE_IN_REGION :
-	(invalid_argument ("Invalid `map-extents' flag", sym), 0);
+	(invalid_constant ("Invalid `map-extents' flag", sym), 0);
 
       flags = XCDR (flags);
     }
@@ -4266,7 +4266,7 @@
   if (EQ (at_flag, Qbefore)) return EXTENT_AT_BEFORE;
   if (EQ (at_flag, Qat))     return EXTENT_AT_AT;
 
-  invalid_argument ("Invalid AT-FLAG in `extent-at'", at_flag);
+  invalid_constant ("Invalid AT-FLAG in `extent-at'", at_flag);
   return EXTENT_AT_AFTER; /* unreached */
 }
 
@@ -5072,7 +5072,7 @@
   if (EQ (layout_obj, Qwhitespace))	return GL_WHITESPACE;
   if (EQ (layout_obj, Qtext))		return GL_TEXT;
 
-  invalid_argument ("Unknown glyph layout type", layout_obj);
+  invalid_constant ("Unknown glyph layout type", layout_obj);
   return GL_TEXT; /* unreached */
 }
 
@@ -5363,13 +5363,13 @@
   else if (EQ (property, Qdetached))
     {
       if (NILP (value))
-	error ("can only set `detached' to t");
+ invalid_operation ("can only set `detached' to t", Qunbound);
       Fdetach_extent (extent);
     }
   else if (EQ (property, Qdestroyed))
     {
       if (NILP (value))
-	error ("can only set `destroyed' to t");
+ invalid_operation ("can only set `destroyed' to t", Qunbound);
       Fdelete_extent (extent);
     }
   else if (EQ (property, Qpriority))
@@ -6578,7 +6578,7 @@
 
   prop = Fextent_property (extent, Qtext_prop, Qnil);
   if (NILP (prop))
-    signal_type_error (Qinternal_error,
+    signal_error (Qinternal_error,
 		       "Internal error: no text-prop", extent);
   val = Fextent_property (extent, prop, Qnil);
 #if 0
@@ -6587,7 +6587,7 @@
   ** with a value of Qnil.  This is bad bad bad.
   */
   if (NILP (val))
-    signal_type_error_2 (Qinternal_error,
+    signal_error_2 (Qinternal_error,
 			 "Internal error: no text-prop",
 			 extent, prop);
 #endif
@@ -6757,51 +6757,50 @@
   INIT_LRECORD_IMPLEMENTATION (extent_info);
   INIT_LRECORD_IMPLEMENTATION (extent_auxiliary);
 
-  defsymbol (&Qextentp, "extentp");
-  defsymbol (&Qextent_live_p, "extent-live-p");
-
-  defsymbol (&Qall_extents_closed, "all-extents-closed");
-  defsymbol (&Qall_extents_open, "all-extents-open");
-  defsymbol (&Qall_extents_closed_open, "all-extents-closed-open");
-  defsymbol (&Qall_extents_open_closed, "all-extents-open-closed");
-  defsymbol (&Qstart_in_region, "start-in-region");
-  defsymbol (&Qend_in_region, "end-in-region");
-  defsymbol (&Qstart_and_end_in_region, "start-and-end-in-region");
-  defsymbol (&Qstart_or_end_in_region, "start-or-end-in-region");
-  defsymbol (&Qnegate_in_region, "negate-in-region");
-
-  defsymbol (&Qdetached, "detached");
-  defsymbol (&Qdestroyed, "destroyed");
-  defsymbol (&Qbegin_glyph, "begin-glyph");
-  defsymbol (&Qend_glyph, "end-glyph");
-  defsymbol (&Qstart_open, "start-open");
-  defsymbol (&Qend_open, "end-open");
-  defsymbol (&Qstart_closed, "start-closed");
-  defsymbol (&Qend_closed, "end-closed");
-  defsymbol (&Qread_only, "read-only");
-  /* defsymbol (&Qhighlight, "highlight"); in faces.c */
-  defsymbol (&Qunique, "unique");
-  defsymbol (&Qduplicable, "duplicable");
-  defsymbol (&Qdetachable, "detachable");
-  defsymbol (&Qpriority, "priority");
-  defsymbol (&Qmouse_face, "mouse-face");
-  defsymbol (&Qinitial_redisplay_function,"initial-redisplay-function");
-
-
-  defsymbol (&Qglyph_layout, "glyph-layout");	/* backwards compatibility */
-  defsymbol (&Qbegin_glyph_layout, "begin-glyph-layout");
-  defsymbol (&Qend_glyph_layout, "end-glyph-layout");
-  defsymbol (&Qoutside_margin, "outside-margin");
-  defsymbol (&Qinside_margin, "inside-margin");
-  defsymbol (&Qwhitespace, "whitespace");
+  DEFSYMBOL (Qextentp);
+  DEFSYMBOL (Qextent_live_p);
+
+  DEFSYMBOL (Qall_extents_closed);
+  DEFSYMBOL (Qall_extents_open);
+  DEFSYMBOL (Qall_extents_closed_open);
+  DEFSYMBOL (Qall_extents_open_closed);
+  DEFSYMBOL (Qstart_in_region);
+  DEFSYMBOL (Qend_in_region);
+  DEFSYMBOL (Qstart_and_end_in_region);
+  DEFSYMBOL (Qstart_or_end_in_region);
+  DEFSYMBOL (Qnegate_in_region);
+
+  DEFSYMBOL (Qdetached);
+  DEFSYMBOL (Qdestroyed);
+  DEFSYMBOL (Qbegin_glyph);
+  DEFSYMBOL (Qend_glyph);
+  DEFSYMBOL (Qstart_open);
+  DEFSYMBOL (Qend_open);
+  DEFSYMBOL (Qstart_closed);
+  DEFSYMBOL (Qend_closed);
+  DEFSYMBOL (Qread_only);
+  /* DEFSYMBOL (Qhighlight); in faces.c */
+  DEFSYMBOL (Qunique);
+  DEFSYMBOL (Qduplicable);
+  DEFSYMBOL (Qdetachable);
+  DEFSYMBOL (Qpriority);
+  DEFSYMBOL (Qmouse_face);
+  DEFSYMBOL (Qinitial_redisplay_function);
+
+
+  DEFSYMBOL (Qglyph_layout);	/* backwards compatibility */
+  DEFSYMBOL (Qbegin_glyph_layout);
+  DEFSYMBOL (Qend_glyph_layout);
+  DEFSYMBOL (Qoutside_margin);
+  DEFSYMBOL (Qinside_margin);
+  DEFSYMBOL (Qwhitespace);
   /* Qtext defined in general.c */
 
-  defsymbol (&Qpaste_function, "paste-function");
-  defsymbol (&Qcopy_function,  "copy-function");
-
-  defsymbol (&Qtext_prop, "text-prop");
-  defsymbol (&Qtext_prop_extent_paste_function,
-	     "text-prop-extent-paste-function");
+  DEFSYMBOL (Qpaste_function);
+  DEFSYMBOL (Qcopy_function);
+
+  DEFSYMBOL (Qtext_prop);
+  DEFSYMBOL (Qtext_prop_extent_paste_function);
 
   DEFSUBR (Fextentp);
   DEFSUBR (Fextent_live_p);