josh/jes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug dealing with coalescing erase change units within one change operation

Browse Source
This commit is contained in:
Josh Holtrop 2017-01-15 20:23:09 -05:00
parent da2bafd563
commit 3b1bea80aa
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Buffer.cc
View File

@ -326,6 +326,7 @@ void Buffer::record_change(size_t offset, size_t length, bool insert)
{ {
/* The new deletion immediately precedes the previous. */ /* The new deletion immediately precedes the previous. */
m_gap_buffer->copy_to(offset, length, *m_change_buffer, cu.change_buffer_offset); m_gap_buffer->copy_to(offset, length, *m_change_buffer, cu.change_buffer_offset);
cu.buffer_position = offset;
} }
cu.length += length; cu.length += length;
return; return;
@ -388,6 +389,7 @@ void Buffer::apply_change_unit(const ChangeUnit & change_unit, bool forward)
{ {
if (forward == change_unit.insert) if (forward == change_unit.insert)
{ {
m_change_buffer->compact();
insert_data(change_unit.buffer_position, insert_data(change_unit.buffer_position,
m_change_buffer->address(change_unit.change_buffer_offset), m_change_buffer->address(change_unit.change_buffer_offset),
change_unit.length); change_unit.length);