diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2020-07-26 16:44:53 +0200 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2020-08-01 14:59:32 +0200 |
| commit | b962bd56a3d53e801a2509ebb68b4c6e4df676cf (patch) | |
| tree | b6b3cb887b01357faf81bb876bcd4c12afc5bb0b /main.c | |
| parent | 41b997f8b80cecda9b7b9c1cebc16d11fb25573d (diff) | |
| download | vis-b962bd56a3d53e801a2509ebb68b4c6e4df676cf.tar.gz vis-b962bd56a3d53e801a2509ebb68b4c6e4df676cf.tar.xz | |
vis: remove z< leftmost pairwise selection combinator
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 15 |
1 files changed, 0 insertions, 15 deletions
@@ -90,7 +90,6 @@ static const char *selections_complement(Vis*, const char *keys, const Arg *arg) static const char *selections_minus(Vis*, const char *keys, const Arg *arg); /* pairwise combine selections from mark */ static const char *selections_combine(Vis*, const char *keys, const Arg *arg); -static Filerange combine_leftmost(const Filerange*, const Filerange*); static Filerange combine_rightmost(const Filerange*, const Filerange*); /* adjust current used count according to keys */ static const char *count(Vis*, const char *keys, const Arg *arg); @@ -287,7 +286,6 @@ enum { VIS_ACTION_SELECTIONS_INTERSECT, VIS_ACTION_SELECTIONS_COMPLEMENT, VIS_ACTION_SELECTIONS_MINUS, - VIS_ACTION_SELECTIONS_COMBINE_LEFTMOST, VIS_ACTION_SELECTIONS_COMBINE_RIGHTMOST, VIS_ACTION_TEXT_OBJECT_WORD_OUTER, VIS_ACTION_TEXT_OBJECT_WORD_INNER, @@ -1033,11 +1031,6 @@ static const KeyAction vis_action[] = { VIS_HELP("Subtract selections from mark") selections_minus }, - [VIS_ACTION_SELECTIONS_COMBINE_LEFTMOST] = { - "vis-selections-combine-leftmost", - VIS_HELP("Pairwise combine: leftmost") - selections_combine, { .combine = combine_leftmost } - }, [VIS_ACTION_SELECTIONS_COMBINE_RIGHTMOST] = { "vis-selections-combine-rightmost", VIS_HELP("Pairwise combine: rightmost") @@ -1797,14 +1790,6 @@ static const char *selections_minus(Vis *vis, const char *keys, const Arg *arg) return keys; } -static Filerange combine_leftmost(const Filerange *r1, const Filerange *r2) { - if (!r1) - return *r2; - if (!r2) - return *r1; - return r1->start < r2->start || (r1->start == r2->start && r1->end < r2->end) ? *r1 : *r2; -} - static Filerange combine_rightmost(const Filerange *r1, const Filerange *r2) { if (!r1) return *r2; |
