Mercurial > hg > xemacs-beta
changeset 5060:86041556214b
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 21 Feb 2010 21:00:09 -0600 |
| parents | c8f90d61dcf3 (current diff) 0e803dc6f096 (diff) |
| children | e7b120e28b49 |
| files | src/ChangeLog |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Feb 21 15:29:12 2010 -0600 +++ b/src/ChangeLog Sun Feb 21 21:00:09 2010 -0600 @@ -52,6 +52,11 @@ * alloc.c (object_memory_usage_stats): Clean up duplication. +2010-02-21 Ben Wing <ben@xemacs.org> + + * extents.c (process_extents_for_insertion_mapper): + Assertion wasn't quite set up correctly in previous patch. + 2010-02-20 Ben Wing <ben@xemacs.org> * EmacsFrame.c:
--- a/src/extents.c Sun Feb 21 15:29:12 2010 -0600 +++ b/src/extents.c Sun Feb 21 21:00:09 2010 -0600 @@ -4944,8 +4944,8 @@ the insertion overlaps any existing extent, something is wrong. */ #ifdef ERROR_CHECK_EXTENTS - assert (extent_start (extent) <= indice || extent_start (extent) > indice + closure->length); - assert (extent_end (extent) <= indice || extent_end (extent) > indice + closure->length); + assert (extent_start (extent) <= indice || extent_start (extent) >= indice + closure->length); + assert (extent_end (extent) <= indice || extent_end (extent) >= indice + closure->length); #endif /* The extent-adjustment code adjusted the extent's endpoints as if