xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compute_modified_ranges corner case that would crash on undo

Browse Source 
Fixes #1506
Fixes #1215
This commit is contained in:
Maxime Coste 2017-11-27 17:29:19 +08:00
parent 40352aed9d
commit d142db80f2
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/selection.cc
View File

@ -167,6 +167,8 @@ Vector<Selection> compute_modified_ranges(Buffer& buffer, size_t timestamp)
kak_assert(std::is_sorted(ranges.begin() + prev_size, ranges.end(), compare_selections)); kak_assert(std::is_sorted(ranges.begin() + prev_size, ranges.end(), compare_selections));
std::inplace_merge(ranges.begin(), ranges.begin() + prev_size, ranges.end(), compare_selections); std::inplace_merge(ranges.begin(), ranges.begin() + prev_size, ranges.end(), compare_selections);
// The newly added ranges might be overlapping pre-existing ones
ranges.erase(merge_overlapping(ranges.begin(), ranges.end(), dummy, overlaps), ranges.end());
} }
const auto end_coord = buffer.end_coord(); const auto end_coord = buffer.end_coord();