aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.def.h1
-rw-r--r--main.c13
-rw-r--r--man/vis.12
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) },
diff --git a/main.c b/main.c
index 452b663..c4c18de 100644
--- a/main.c
+++ b/main.c
@@ -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;
diff --git a/man/vis.1 b/man/vis.1
index 17a00ee..c835b00 100644
--- a/man/vis.1
+++ b/man/vis.1
@@ -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-