From 06db83de37afbaf347b317cc1870e99b43ac3460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Sun, 9 Jul 2017 12:23:57 +0200 Subject: vis: simplify selection complement and minus implementation --- main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index 1b19eca..c820a79 100644 --- a/main.c +++ b/main.c @@ -1759,7 +1759,7 @@ static const char *selections_intersect(Vis *vis, const char *keys, const Arg *a } static void complement(Array *ret, Array *a, Filerange *universe) { - size_t pos = 0; + size_t pos = universe->start; for (size_t i = 0, len = array_length(a); i < len; i++) { Filerange *r = array_get(a, i); if (pos < r->start) { @@ -1792,6 +1792,7 @@ static const char *selections_complement(Vis *vis, const char *keys, const Arg * } static const char *selections_minus(Vis *vis, const char *keys, const Arg *arg) { + Text *txt = vis_text(vis); View *view = vis_view(vis); bool anchored = view_selections_anchored(view_selections_primary_get(view)); enum VisMark mark = vis_mark_used(vis); @@ -1802,10 +1803,7 @@ static const char *selections_minus(Vis *vis, const char *keys, const Arg *arg) Array b_complement; array_init_from(&b_complement, &b); - Filerange universe = text_range_new(0, 0); - Filerange *max = array_get(&a, array_length(&a)-1); - if (max) - universe = text_range_new(max->end, max->end); + Filerange universe = text_object_entire(txt, 0); complement(&b_complement, &b, &universe); intersect(&sel, &a, &b_complement); -- cgit v1.2.3