vis

commit fd358dfe154513cfb9518afdfed1a74d9d148e91
parent 9b3903e881781b9bee03007238bef9f3fbb4f600
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Sun, 26 Jul 2020 16:34:20 +0200

vis: remove z| pairwise union

Diffstat:
M
config.def.h
 | 
1
-
M
main.c
 | 
15
---------------
M
man/vis.1
 | 
2
--

3 files changed, 0 insertions(+), 18 deletions(-)
diff --git 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_UNION)            },
 	{ "z&",                 ACTION(SELECTIONS_COMBINE_INTERSECT)        },
 	{ "z+",                 ACTION(SELECTIONS_COMBINE_LONGER)           },
 	{ "z-",                 ACTION(SELECTIONS_COMBINE_SHORTER)          },
diff --git 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_union(const Filerange*, const Filerange*);
 static Filerange combine_intersect(const Filerange*, const Filerange*);
 static Filerange combine_longer(const Filerange*, const Filerange*);
 static Filerange combine_shorter(const Filerange*, const Filerange*);
@@ -291,7 +290,6 @@ enum {
 	VIS_ACTION_SELECTIONS_INTERSECT,
 	VIS_ACTION_SELECTIONS_COMPLEMENT,
 	VIS_ACTION_SELECTIONS_MINUS,
-	VIS_ACTION_SELECTIONS_COMBINE_UNION,
 	VIS_ACTION_SELECTIONS_COMBINE_INTERSECT,
 	VIS_ACTION_SELECTIONS_COMBINE_LONGER,
 	VIS_ACTION_SELECTIONS_COMBINE_SHORTER,
@@ -1041,11 +1039,6 @@ static const KeyAction vis_action[] = {
 		VIS_HELP("Subtract selections from mark")
 		selections_minus
 	},
-	[VIS_ACTION_SELECTIONS_COMBINE_UNION] = {
-		"vis-selections-combine-union",
-		VIS_HELP("Pairwise union with selections from mark")
-		selections_combine, { .combine = combine_union }
-	},
 	[VIS_ACTION_SELECTIONS_COMBINE_INTERSECT] = {
 		"vis-selections-combine-intersect",
 		VIS_HELP("Pairwise intersect with selections from mark")
@@ -1825,14 +1818,6 @@ static const char *selections_minus(Vis *vis, const char *keys, const Arg *arg) 
 	return keys;
 }
 
-static Filerange combine_union(const Filerange *r1, const Filerange *r2) {
-	if (!r1)
-		return *r2;
-	if (!r2)
-		return *r1;
-	return text_range_union(r1, r2);
-}
-
 static Filerange combine_intersect(const Filerange *r1, const Filerange *r2) {
 	if (!r1 || !r2)
 		return text_range_empty();
diff --git a/man/vis.1 b/man/vis.1
@@ -1162,8 +1162,6 @@ set intersection
 set minus
 .It Ic ~
 set complement
-.It Ic z\&|
-pairwise union
 .It Ic z&
 pairwise intersection
 .It Ic z+