Mercurial > hg > xemacs-beta
diff src/extents.c @ 771:943eaba38521
[xemacs-hg @ 2002-03-13 08:51:24 by ben]
The big ben-mule-21-5 check-in!
Various files were added and deleted. See CHANGES-ben-mule.
There are still some test suite failures. No crashes, though.
Many of the failures have to do with problems in the test suite itself
rather than in the actual code. I'll be addressing these in the next
day or so -- none of the test suite failures are at all critical.
Meanwhile I'll be trying to address the biggest issues -- i.e. build
or run failures, which will almost certainly happen on various platforms.
All comments should be sent to ben@xemacs.org -- use a Cc: if necessary
when sending to mailing lists. There will be pre- and post- tags,
something like
pre-ben-mule-21-5-merge-in, and
post-ben-mule-21-5-merge-in.
| author | ben |
|---|---|
| date | Wed, 13 Mar 2002 08:54:06 +0000 |
| parents | fdefd0186b75 |
| children | e38acbeb1cae |
line wrap: on
line diff
--- a/src/extents.c Fri Mar 08 13:33:14 2002 +0000 +++ b/src/extents.c Wed Mar 13 08:54:06 2002 +0000 @@ -1198,7 +1198,7 @@ /* Don't destroy the extents here -- there may still be children extents pointing to the extents. */ - detach_all_extents (make_buffer (b)); + detach_all_extents (wrap_buffer (b)); finalize_extent_info (data, 0); } @@ -1215,6 +1215,8 @@ #ifdef ERROR_CHECK_EXTENTS +/* See unicode.c for more about sledgehammer checks */ + void sledgehammer_extent_check (Lisp_Object object) { @@ -2268,7 +2270,7 @@ if (flags & ME_MIGHT_THROW) /* This deletes the range extent and frees the marker. */ - unbind_to (count, Qnil); + unbind_to (count); else { /* Delete them ourselves */ @@ -4726,9 +4728,9 @@ once. One confusing thing here is that our caller never actually calls - unbind_to (closure.speccount, Qnil). This is because + unbind_to (closure.speccount). This is because map_extents_bytebpos() unbinds before, and with a smaller - speccount. The additional unbind_to() in + speccount. The additional unbind_to_1() in report_extent_modification() would cause XEmacs to abort. */ if (closure->speccount == -1) { @@ -5859,7 +5861,7 @@ closure.from = opoint; closure.length = length; closure.string = string; - buffer = make_buffer (buf); + buffer = wrap_buffer (buf); GCPRO2 (buffer, string); map_extents_bytebpos (opoint, opoint + length, add_string_extents_mapper, (void *) &closure, buffer, 0, @@ -5928,7 +5930,7 @@ struct gcpro gcpro1, gcpro2; Lisp_Object buffer; - buffer = make_buffer (buf); + buffer = wrap_buffer (buf); closure.opoint = opoint; closure.pos = pos; closure.length = length; @@ -6918,11 +6920,7 @@ Vextent_face_reusable_list = Fcons (Qnil, Qnil); staticpro (&Vextent_face_reusable_list); -} - -void -complex_vars_of_extents (void) -{ + staticpro (&Vextent_face_memoize_hash_table); /* The memoize hash table maps from lists of symbols to lists of faces. It needs to be `equal' to implement the memoization.