Mercurial > hg > xemacs-beta
diff src/insdel.c @ 5879:77d7b77909c2
Move extents.c to working in byte positions only; fix a bug, extent_detach()
src/ChangeLog addition:
2015-03-27 Aidan Kehoe <kehoea@parhasard.net>
Fix a small bug, extent_detach(); minimise needless char-byte
conversion, extents.c, sticking to byte positions in general in
this file.
* extents.c:
* extents.c (signal_single_extent_changed):
Pass byte endpoints to
gutter_extent_signal_changed_region_maybe(),
buffer_extent_signal_changed_region().
* extents.c (extent_detach):
Call signal_extent_changed() correctly, pass both extent endpoints
rather than just the byte and character variants of the start.
* extents.c (struct report_extent_modification_closure):
Do this in terms of byte positions.
* extents.c (report_extent_modification_mapper):
Use byte positions, only converting to characters when we are
definitely calling Lisp.
* extents.c (report_extent_modification):
Use byte positions in this API, move the byte-char conversion to
our callers, simplifying extents.c (it all now works in byte
positions).
* extents.h:
Update report_extent_modification's prototype.
* gutter.c (gutter_extent_signal_changed_region_maybe):
Use byte positions here, avoids needless byte-char conversion.
* gutter.h:
Update the prototype here.
* insdel.c:
* insdel.c (buffer_extent_signal_changed_region):
Implement this in terms of byte positions.
* insdel.c (signal_before_change):
* insdel.c (signal_after_change):
Call report_extent_modification() with byte positions, doing the
char->byte conversion here rather than leaving it to extents.c.
* insdel.h:
* insdel.h (struct each_buffer_change_data):
The extent unchanged info now describes bytecounts.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Fri, 27 Mar 2015 23:39:49 +0000 |
| parents | 65d65b52d608 |
| children |
line wrap: on
line diff
--- a/src/insdel.c Thu Mar 26 20:47:12 2015 -0400 +++ b/src/insdel.c Fri Mar 27 23:39:49 2015 +0000 @@ -570,15 +570,15 @@ } void -buffer_extent_signal_changed_region (struct buffer *buf, Charbpos start, - Charbpos end) +buffer_extent_signal_changed_region (struct buffer *buf, Bytebpos start, + Bytebpos end) { if (buf->changes->begin_extent_unchanged < 0 || - buf->changes->begin_extent_unchanged > start - BUF_BEG (buf)) - buf->changes->begin_extent_unchanged = start - BUF_BEG (buf); + buf->changes->begin_extent_unchanged > start - BYTE_BUF_BEG (buf)) + buf->changes->begin_extent_unchanged = start - BYTE_BUF_BEG (buf); if (buf->changes->end_extent_unchanged < 0 || - buf->changes->end_extent_unchanged > BUF_Z (buf) - end) - buf->changes->end_extent_unchanged = BUF_Z (buf) - end; + buf->changes->end_extent_unchanged > BYTE_BUF_Z (buf) - end) + buf->changes->end_extent_unchanged = BYTE_BUF_Z (buf) - end; } void @@ -837,10 +837,16 @@ if (end < BUF_BEGV (buf)) end = BUF_BEGV (buf); if (end > BUF_ZV (buf)) end = BUF_ZV (buf); - MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons) - { - report_extent_modification (wrap_buffer (mbuf), start, end, 0); - } + { + Bytexpos byte_start = charbpos_to_bytebpos (buf, start); + Bytexpos byte_end = charbpos_to_bytebpos (buf, end); + + MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons) + { + report_extent_modification (wrap_buffer (mbuf), byte_start, + byte_end, 0); + } + } unbind_to (speccount); /* Only now do we indicate that the before-change-functions have @@ -930,12 +936,17 @@ if (orig_end < BUF_BEGV (buf)) orig_end = BUF_BEGV (buf); if (orig_end > BUF_ZV (buf)) orig_end = BUF_ZV (buf); - MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons) - { - buffer = wrap_buffer (mbuf); - report_extent_modification (buffer, start, new_end, 1); - } - unbind_to (speccount); /* sets inside_change_hook back to 0 */ + { + Bytexpos byte_start = charbpos_to_bytebpos (buf, start); + Bytexpos byte_new_end = charbpos_to_bytebpos (buf, new_end); + + MAP_INDIRECT_BUFFERS (buf, mbuf, bufcons) + { + buffer = wrap_buffer (mbuf); + report_extent_modification (buffer, byte_start, byte_new_end, 1); + } + unbind_to (speccount); /* sets inside_change_hook back to 0 */ + } } }