diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2020-07-26 16:36:58 +0200 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2020-08-01 14:59:32 +0200 |
| commit | 1f9ae08826e52f74c683d70e2ec741ec74a127d1 (patch) | |
| tree | 0d9f81e63e4b1bd665a150b9d891b1692287f55d | |
| parent | 404bb95c5cc810c23dcc257cd6a5644b28540287 (diff) | |
| download | vis-1f9ae08826e52f74c683d70e2ec741ec74a127d1.tar.gz vis-1f9ae08826e52f74c683d70e2ec741ec74a127d1.tar.xz | |
vis: remove z& pairwise selection intersection
| -rw-r--r-- | config.def.h | 1 | ||||
| -rw-r--r-- | main.c | 13 | ||||
| -rw-r--r-- | man/vis.1 | 2 |
3 files changed, 0 insertions, 16 deletions
diff --git a/config.def.h b/config.def.h index 82920b6..792b257 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_INTERSECT) }, { "z+", ACTION(SELECTIONS_COMBINE_LONGER) }, { "z-", ACTION(SELECTIONS_COMBINE_SHORTER) }, { "z<", ACTION(SELECTIONS_COMBINE_LEFTMOST) }, @@ -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_intersect(const Filerange*, const Filerange*); static Filerange combine_longer(const Filerange*, const Filerange*); static Filerange combine_shorter(const Filerange*, const Filerange*); static Filerange combine_leftmost(const Filerange*, const Filerange*); @@ -290,7 +289,6 @@ enum { VIS_ACTION_SELECTIONS_INTERSECT, VIS_ACTION_SELECTIONS_COMPLEMENT, VIS_ACTION_SELECTIONS_MINUS, - VIS_ACTION_SELECTIONS_COMBINE_INTERSECT, VIS_ACTION_SELECTIONS_COMBINE_LONGER, VIS_ACTION_SELECTIONS_COMBINE_SHORTER, VIS_ACTION_SELECTIONS_COMBINE_LEFTMOST, @@ -1039,11 +1037,6 @@ static const KeyAction vis_action[] = { VIS_HELP("Subtract selections from mark") selections_minus }, - [VIS_ACTION_SELECTIONS_COMBINE_INTERSECT] = { - "vis-selections-combine-intersect", - VIS_HELP("Pairwise intersect with selections from mark") - selections_combine, { .combine = combine_intersect } - }, [VIS_ACTION_SELECTIONS_COMBINE_LONGER] = { "vis-selections-combine-longer", VIS_HELP("Pairwise combine: take longer") @@ -1818,12 +1811,6 @@ static const char *selections_minus(Vis *vis, const char *keys, const Arg *arg) return keys; } -static Filerange combine_intersect(const Filerange *r1, const Filerange *r2) { - if (!r1 || !r2) - return text_range_empty(); - return text_range_intersect(r1, r2); -} - static Filerange combine_longer(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 intersection .It Ic z+ pairwise combine, choose longer .It Ic z- |