Mercurial > hg > xemacs-beta

diff src/extents.c @ 793:e38acbeb1cae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-29 04:46:17 by ben] lots o' fixes etc/ChangeLog: New file. Separated out all entries for etc/ into their own ChangeLog. Includes entries for the following files: etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad, etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL, etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS, etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL, etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se, etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh, etc/custom/example-themes/europe-theme.el, etc/custom/example-themes/ex-custom-file, etc/custom/example-themes/example-theme.el, etc/e/eterm.ti, etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1, etc/gnuserv.README, etc/package-index.LATEST.gpg, etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm, etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs, etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E, etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar, etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1, etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL, etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el, etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\* unicode/unicode-consortium/8859-16.TXT: New file. mule/english.el: Define this charset now, since a bug was fixed that formerly prevented it. mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be integers. Makefile.in.in: Always include gui.c, to fix compile error when TTY-only. EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo(). Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate nearly all uses of Lisp_String * in favor of Lisp_Object, and correct macros so most of them favor Lisp_Object. Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings, but at level `debug' (usually ignored). Use it when instantiating specifiers, so problems can be debugged. Move log-warning-minimum-level into C so that we can optimize ERROR_ME_DEBUG_WARN. Fix warning levels consistent with new definitions. Add default_ and parent fields to char table; not yet implemented. New fun Dynarr_verify(); use for further error checking on Dynarrs. Rearrange code at top of lisp.h in conjunction with dynarr changes. Fix eifree(). Use Eistrings in various places (format_event_object(), where_is_to_char(), and callers thereof) to avoid fixed-size strings buffers. New fun write_eistring(). Reindent and fix GPM code to follow standards. Set default MS Windows font to Lucida Console (same size as Courier New but less interline spacing, so more lines fit). Increase default frame size on Windows to 50 lines. (If that's too big for the workspace, the frame will be shrunk as necessary.) Fix problem with text files with no newlines (). (Change `convert-eol' coding system to use `nil' for autodetect, consistent with make-coding-system.) Correct compile warnings in vm-limit.c. Fix handling of reverse-direction charsets to avoid errors when opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el. Recode some object printing methods to use write_fmt_string() instead of a fixed buffer and sprintf. Turn on display of png comments as warnings (level `info'), now that they're unobtrusive. Revamped the sound documentation. Fixed bug in redisplay w.r.t. hscroll/truncation/continuation glyphs causing jumping up and down of the lines, since they're bigger than the line size. (It was seen most obviously when there's a horizontal scroll bar, e.g. do C-h a glyph or something like that.) The problem was that the glyph-contrib-p setting on glyphs was ignored even if it was set properly, which it wasn't until now.
author ben
date Fri, 29 Mar 2002 04:49:13 +0000
parents 943eaba38521
children a5954632b187
line wrap: on
line diff
--- a/src/extents.c	Sat Mar 23 05:08:52 2002 +0000
+++ b/src/extents.c	Fri Mar 29 04:49:13 2002 +0000
@@ -1,6 +1,6 @@
 /* Copyright (c) 1994, 1995 Free Software Foundation, Inc.
    Copyright (c) 1995 Sun Microsystems, Inc.
-   Copyright (c) 1995, 1996, 2000 Ben Wing.
+   Copyright (c) 1995, 1996, 2000, 2002 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -938,7 +938,7 @@
     alloc_lcrecord_type (struct extent_auxiliary, &lrecord_extent_auxiliary);
 
   copy_lcrecord (data, &extent_auxiliary_defaults);
-  XSETEXTENT_AUXILIARY (extent_aux, data);
+  extent_aux = wrap_extent_auxiliary (data);
   ext->plist = Fcons (extent_aux, ext->plist);
   ext->flags.has_aux = 1;
 }
@@ -994,9 +994,8 @@
       for (i = 0; i < extent_list_num_els (list); i++)
 	{
 	  struct extent *extent = extent_list_at (list, i, 0);
-	  Lisp_Object exobj;
-
-	  XSETEXTENT (exobj, extent);
+	  Lisp_Object exobj = wrap_extent (extent);
+
 	  mark_object (exobj);
 	}
     }
@@ -1036,7 +1035,7 @@
   struct extent_info *data =
     alloc_lcrecord_type (struct extent_info, &lrecord_extent_info);
 
-  XSETEXTENT_INFO (extent_info, data);
+  extent_info = wrap_extent_info (data);
   data->extents = allocate_extent_list ();
   data->soe = 0;
   return extent_info;
@@ -1074,7 +1073,7 @@
 decode_buffer_or_string (Lisp_Object object)
 {
   if (NILP (object))
-    XSETBUFFER (object, current_buffer);
+    object = wrap_buffer (current_buffer);
   else if (BUFFERP (object))
     CHECK_LIVE_BUFFER (object);
   else if (STRINGP (object))
@@ -1105,7 +1104,7 @@
 {
   if (STRINGP (object))
     {
-      Lisp_Object plist = XSTRING (object)->plist;
+      Lisp_Object plist = XSTRING_PLIST (object);
       if (!CONSP (plist) || !EXTENT_INFOP (XCAR (plist)))
 	return 0;
       return XEXTENT_INFO (XCAR (plist));
@@ -1147,7 +1146,7 @@
 				    destroyed buffers, or special
 				    Lisp-inaccessible buffer objects. */
       extent_info = allocate_extent_info ();
-      XSTRING (object)->plist = Fcons (extent_info, XSTRING (object)->plist);
+      XSTRING_PLIST (object) = Fcons (extent_info, XSTRING_PLIST (object));
       return XEXTENT_INFO (extent_info);
     }
 
@@ -1281,7 +1280,7 @@
   Lisp_Object extent;
   char buf[200];
 
-  XSETEXTENT (extent, e);
+  extent = wrap_extent (e);
   print_extent_1 (buf, extent);
   fputs (buf, stdout);
 }
@@ -2801,7 +2800,7 @@
 	  struct glyph_block gb;
 
 	  gb.glyph = glyph;
-	  XSETEXTENT (gb.extent, e);
+	  gb.extent = wrap_extent (e);
 	  Dynarr_add (ef->begin_glyphs, gb);
 	}
     }
@@ -2816,7 +2815,7 @@
 	  struct glyph_block gb;
 
 	  gb.glyph = glyph;
-	  XSETEXTENT (gb.extent, e);
+	  gb.extent = wrap_extent (e);
 	  Dynarr_add (ef->end_glyphs, gb);
 	}
     }
@@ -2901,12 +2900,12 @@
 
 	      /* FIXME: One should probably inhibit the displaying of
 		 this extent to reduce flicker */
-	      extent_in_red_event_p(e) = 1;
+	      extent_in_red_event_p (e) = 1;
 
 	      /* call the function */
-	      XSETEXTENT(obj,e);
-	      if(!NILP(function))
-	         Fenqueue_eval_event(function,obj);
+	      obj = wrap_extent (e);
+	      if (!NILP (function))
+	         Fenqueue_eval_event (function, obj);
 	    }
 	}
     }
@@ -3341,7 +3340,6 @@
 */
        (extent))
 {
-  Lisp_Object val;
   EXTENT next;
 
   if (EXTENTP (extent))
@@ -3351,8 +3349,7 @@
 
   if (!next)
     return Qnil;
-  XSETEXTENT (val, next);
-  return val;
+  return wrap_extent (next);
 }
 
 DEFUN ("previous-extent", Fprevious_extent, 1, 1, 0, /*
@@ -3363,7 +3360,6 @@
 */
        (extent))
 {
-  Lisp_Object val;
   EXTENT prev;
 
   if (EXTENTP (extent))
@@ -3373,8 +3369,7 @@
 
   if (!prev)
     return Qnil;
-  XSETEXTENT (val, prev);
-  return val;
+  return wrap_extent (prev);
 }
 
 #ifdef DEBUG_XEMACS
@@ -3386,7 +3381,6 @@
 */
        (extent))
 {
-  Lisp_Object val;
   EXTENT next;
 
   if (EXTENTP (extent))
@@ -3396,8 +3390,7 @@
 
   if (!next)
     return Qnil;
-  XSETEXTENT (val, next);
-  return val;
+  return wrap_extent (next);
 }
 
 DEFUN ("previous-e-extent", Fprevious_e_extent, 1, 1, 0, /*
@@ -3408,7 +3401,6 @@
 */
        (extent))
 {
-  Lisp_Object val;
   EXTENT prev;
 
   if (EXTENTP (extent))
@@ -3418,8 +3410,7 @@
 
   if (!prev)
     return Qnil;
-  XSETEXTENT (val, prev);
-  return val;
+  return wrap_extent (prev);
 }
 
 #endif
@@ -3531,7 +3522,7 @@
   Lisp_Object cur_parent = extent_parent (e);
   Lisp_Object rest;
 
-  XSETEXTENT (extent, e);
+  extent = wrap_extent (e);
   if (!NILP (parent))
     CHECK_LIVE_EXTENT (parent);
   if (EQ (parent, cur_parent))
@@ -3600,8 +3591,8 @@
     {
       if (extent_duplicable_p (extent))
 	{
-	  Lisp_Object extent_obj;
-	  XSETEXTENT (extent_obj, extent);
+	  Lisp_Object extent_obj = wrap_extent (extent);
+
 	  record_extent (extent_obj, 1);
 	}
     }
@@ -3681,7 +3672,7 @@
 			     &lrecord_extent_auxiliary);
 
       copy_lcrecord (data, XEXTENT_AUXILIARY (XCAR (original->plist)));
-      XSETEXTENT_AUXILIARY (XCAR (e->plist), data);
+      XCAR (e->plist) = wrap_extent_auxiliary (data);
     }
 
   {
@@ -3689,8 +3680,8 @@
     Lisp_Object parent = extent_parent (e);
     if (!NILP (parent))
       {
-	Lisp_Object extent;
-	XSETEXTENT (extent, e);
+	Lisp_Object extent = wrap_extent (e);
+
 	add_extent_to_children_list (XEXTENT (parent), extent);
       }
   }
@@ -3713,7 +3704,7 @@
       LIST_LOOP_DELETING (rest, nextrest, XWEAK_LIST_LIST (children))
 	Fset_extent_parent (XCAR (rest), Qnil);
     }
-  XSETEXTENT (extent_obj, extent);
+  extent_obj = wrap_extent (extent);
   Fset_extent_parent (extent_obj, Qnil);
   /* mark the extent as destroyed */
   extent_object (extent) = Qt;
@@ -3739,7 +3730,7 @@
     {
       if (NILP (buffer_or_string))
 	obj = Qnil;
-      XSETEXTENT (extent_obj, make_extent_detached (obj));
+      extent_obj = wrap_extent (make_extent_detached (obj));
     }
   else
     {
@@ -3747,7 +3738,7 @@
 
       get_buffer_or_string_range_byte (obj, from, to, &start, &end,
 				       GB_ALLOW_PAST_ACCESSIBLE);
-      XSETEXTENT (extent_obj, make_extent_internal (obj, start, end));
+      extent_obj = wrap_extent (make_extent_internal (obj, start, end));
     }
   return extent_obj;
 }
@@ -3765,8 +3756,7 @@
   else
     buffer_or_string = decode_buffer_or_string (buffer_or_string);
 
-  XSETEXTENT (extent, copy_extent (ext, -1, -1, buffer_or_string));
-  return extent;
+  return wrap_extent (copy_extent (ext, -1, -1, buffer_or_string));
 }
 
 DEFUN ("delete-extent", Fdelete_extent, 1, 1, 0, /*
@@ -3943,9 +3933,8 @@
 {
   /* This function can GC */
   struct slow_map_extents_arg *closure = (struct slow_map_extents_arg *) arg;
-  Lisp_Object extent_obj;
-
-  XSETEXTENT (extent_obj, extent);
+  Lisp_Object extent_obj = wrap_extent (extent);
+
 
   /* make sure this extent qualifies according to the PROPERTY
      and VALUE args */
@@ -4137,7 +4126,7 @@
 	return 0;
       /* corner case:  prev_end can be -1 if there is no prev */
     }
-  XSETEXTENT (extent_obj, extent);
+  extent_obj = wrap_extent (extent);
 
   /* make sure this extent qualifies according to the PROPERTY
      and VALUE args */
@@ -4284,8 +4273,8 @@
      if it has a non-nil value for that property. */
   if (!NILP (closure->prop))
     {
-      Lisp_Object extent;
-      XSETEXTENT (extent, e);
+      Lisp_Object extent = wrap_extent (e);
+
       if (NILP (Fextent_property (extent, closure->prop, Qnil)))
 	return 0;
     }
@@ -4311,15 +4300,14 @@
       else
 	return 0;
     accept:
-      XSETEXTENT (closure->best_match, e);
+      closure->best_match = wrap_extent (e);
       closure->best_start = extent_start (e);
       closure->best_end = extent_end (e);
     }
   else
     {
-      Lisp_Object extent;
-
-      XSETEXTENT (extent, e);
+      Lisp_Object extent = wrap_extent (e);
+
       closure->best_match = Fcons (extent, closure->best_match);
     }
 
@@ -4718,9 +4706,9 @@
   if (NILP (hook))
     return 0;
 
-  XSETEXTENT (exobj, extent);
-  XSETINT (startobj, closure->start);
-  XSETINT (endobj, closure->end);
+  exobj = wrap_extent (extent);
+  startobj = make_int (closure->start);
+  endobj = make_int (closure->end);
 
   /* Now that we are sure to call elisp, set up an unwind-protect so
      inside_change_hook gets restored in case we throw.  Also record
@@ -5530,7 +5518,7 @@
     return cons3 (Qdestroyed, Qt, Qnil);
 
   anc = extent_ancestor (e);
-  XSETEXTENT (anc_obj, anc);
+  anc_obj = wrap_extent (anc);
 
   /* For efficiency, use the ancestor for all properties except detached */
 
@@ -5644,7 +5632,7 @@
   if (NILP (extent))
     highlight_p = Qnil;
   else
-    XSETEXTENT (extent, decode_extent (extent, DE_MUST_BE_ATTACHED));
+    extent = wrap_extent (decode_extent (extent, DE_MUST_BE_ATTACHED));
   do_highlight (extent, !NILP (highlight_p));
   return Qnil;
 }
@@ -5679,7 +5667,7 @@
   /* This function can GC */
   Lisp_Object extent;
   Lisp_Object copy_fn;
-  XSETEXTENT (extent, e);
+  extent = wrap_extent (e);
   copy_fn = Fextent_property (extent, prop, Qnil);
   if (!NILP (copy_fn))
     {
@@ -5735,8 +5723,6 @@
 	       Lisp_Object object, int run_hooks)
 {
   /* This function can GC */
-  Lisp_Object tmp;
-
   if (!EQ (extent_object (extent), object))
     goto copy_it;
 
@@ -5765,8 +5751,7 @@
 	}
     }
 
-  XSETEXTENT (tmp, extent);
-  return tmp;
+  return wrap_extent (extent);
 
  copy_it:
   if (run_hooks &&
@@ -5774,10 +5759,7 @@
     /* The paste-function said don't attach a copy of the extent here. */
     return Qnil;
   else
-    {
-      XSETEXTENT (tmp, copy_extent (extent, new_start, new_end, object));
-      return tmp;
-    }
+    return wrap_extent (copy_extent (extent, new_start, new_end, object));
 }
 
 DEFUN ("insert-extent", Finsert_extent, 1, 5, 0, /*
@@ -5928,9 +5910,8 @@
 {
   struct splice_in_string_extents_arg closure;
   struct gcpro gcpro1, gcpro2;
-  Lisp_Object buffer;
-
-  buffer = wrap_buffer (buf);
+  Lisp_Object buffer = wrap_buffer (buf);
+
   closure.opoint = opoint;
   closure.pos = pos;
   closure.length = length;
@@ -6178,7 +6159,7 @@
   Lisp_Object extent, e_val;
   int is_eq;
 
-  XSETEXTENT (extent, e);
+  extent = wrap_extent (e);
 
   /* Note: in some cases when the property itself is 'start-open
      or 'end-closed, the checks to set the openness may do a bit
@@ -6335,8 +6316,8 @@
   Bytebpos e_start, e_end;
   Bytebpos start = closure->start;
   Bytebpos end   = closure->end;
-  Lisp_Object extent;
-  XSETEXTENT (extent, e);
+  Lisp_Object extent = wrap_extent (e);
+
   e_start = extent_endpoint_bytebpos (e, 0);
   e_end   = extent_endpoint_bytebpos (e, 1);
 
@@ -6408,9 +6389,8 @@
    */
   if (!NILP (value) && NILP (closure.the_extent))
     {
-      Lisp_Object extent;
-
-      XSETEXTENT (extent, make_extent_internal (object, start, end));
+      Lisp_Object extent = wrap_extent (make_extent_internal (object, start, end));
+
       closure.changed_p = 1;
       Fset_extent_property (extent, Qtext_prop, prop);
       Fset_extent_property (extent, prop, value);