diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2020-07-26 16:39:10 +0200 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2020-08-01 14:59:32 +0200 |
| commit | d6405056ab182e55ac554c9f45be0f169efb9bb1 (patch) | |
| tree | e37012986f9bb9f5de1e3e802618dd09dc3df831 | |
| parent | 1f9ae08826e52f74c683d70e2ec741ec74a127d1 (diff) | |
| download | vis-d6405056ab182e55ac554c9f45be0f169efb9bb1.tar.gz vis-d6405056ab182e55ac554c9f45be0f169efb9bb1.tar.xz | |
vis: remove z+ longer pairwise selection combinator
| -rw-r--r-- | config.def.h | 1 | ||||
| -rw-r--r-- | main.c | 17 | ||||
| -rw-r--r-- | man/vis.1 | 2 |
3 files changed, 0 insertions, 20 deletions
diff --git a/config.def.h b/config.def.h index 792b257..7f992b2 100644 --- a/config.def.h +++ b/config.def.h @@ -135,7 +135,6 @@ static const KeyBinding bindings_selections[] = { { "&", ACTION(SELECTIONS_INTERSECT) }, { "~", ACTION(SELECTIONS_COMPLEMENT) }, { "\\", ACTION(SELECTIONS_MINUS) }, - { "z+", ACTION(SELECTIONS_COMBINE_LONGER) }, { "z-", ACTION(SELECTIONS_COMBINE_SHORTER) }, { "z<", ACTION(SELECTIONS_COMBINE_LEFTMOST) }, { "z>", ACTION(SELECTIONS_COMBINE_RIGHTMOST) }, @@ -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_longer(const Filerange*, const Filerange*); static Filerange combine_shorter(const Filerange*, const Filerange*); static Filerange combine_leftmost(const Filerange*, const Filerange*); static Filerange combine_rightmost(const Filerange*, const Filerange*); @@ -289,7 +288,6 @@ enum { VIS_ACTION_SELECTIONS_INTERSECT, VIS_ACTION_SELECTIONS_COMPLEMENT, VIS_ACTION_SELECTIONS_MINUS, - VIS_ACTION_SELECTIONS_COMBINE_LONGER, VIS_ACTION_SELECTIONS_COMBINE_SHORTER, VIS_ACTION_SELECTIONS_COMBINE_LEFTMOST, VIS_ACTION_SELECTIONS_COMBINE_RIGHTMOST, @@ -1037,11 +1035,6 @@ static const KeyAction vis_action[] = { VIS_HELP("Subtract selections from mark") selections_minus }, - [VIS_ACTION_SELECTIONS_COMBINE_LONGER] = { - "vis-selections-combine-longer", - VIS_HELP("Pairwise combine: take longer") - selections_combine, { .combine = combine_longer } - }, [VIS_ACTION_SELECTIONS_COMBINE_SHORTER] = { "vis-selections-combine-shorter", VIS_HELP("Pairwise combine: take shorter") @@ -1811,16 +1804,6 @@ static const char *selections_minus(Vis *vis, const char *keys, const Arg *arg) return keys; } -static Filerange combine_longer(const Filerange *r1, const Filerange *r2) { - if (!r1) - return *r2; - if (!r2) - return *r1; - size_t l1 = text_range_size(r1); - size_t l2 = text_range_size(r2); - return l1 < l2 ? *r2 : *r1; -} - static Filerange combine_shorter(const Filerange *r1, const Filerange *r2) { if (!r1) return *r2; @@ -1162,8 +1162,6 @@ set intersection set minus .It Ic ~ set complement -.It Ic z+ -pairwise combine, choose longer .It Ic z- pairwise combine, choose shorter .It Ic z< |