summaryrefslogtreecommitdiff
path: root/src/normal.cc
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2017-08-18 08:52:40 +0700
committerMaxime Coste <mawww@kakoune.org>2017-08-18 08:52:40 +0700
commit82d23bc400616989297953785da85cffc73cbc2c (patch)
treea4c601d2f3033a89c84bbc558ee679f51b1d4a34 /src/normal.cc
parent609a8ee8c793856b8c1e6b7c553ee3475ca8308f (diff)
Remove now trivial Selection::merge_with method
Diffstat (limited to 'src/normal.cc')
-rw-r--r--src/normal.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/normal.cc b/src/normal.cc
index fd44110f..78b134cf 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -63,7 +63,7 @@ void select(Context& context, T func)
}
if (mode == SelectMode::Extend)
- sel.merge_with(*res);
+ sel.cursor() = res->cursor();
else
{
sel.anchor() = res->anchor();
@@ -772,7 +772,7 @@ void search(Context& context, NormalParams params)
if (mode == SelectMode::Replace)
sel = keep_direction(find_next_match<direction>(context, sel, regex, wrapped), sel);
if (mode == SelectMode::Extend)
- sel.merge_with(find_next_match<direction>(context, sel, regex, wrapped));
+ sel.cursor() = find_next_match<direction>(context, sel, regex, wrapped).cursor();
}
selections.sort_and_merge_overlapping();
} while (--c > 0);