diff options
| -rw-r--r-- | config.def.h | 1 | ||||
| -rw-r--r-- | main.c | 15 | ||||
| -rw-r--r-- | man/vis.1 | 2 |
3 files changed, 0 insertions, 18 deletions
diff --git a/config.def.h b/config.def.h index c6eeb9e..894149f 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_LEFTMOST) }, { "z>", ACTION(SELECTIONS_COMBINE_RIGHTMOST) }, { "_", ACTION(SELECTIONS_TRIM) }, { "<S-Tab>", ACTION(SELECTIONS_ALIGN_INDENT_RIGHT) }, @@ -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; @@ -1162,8 +1162,6 @@ set intersection set minus .It Ic ~ set complement -.It Ic z< -pairwise combine, choose leftmost .It Ic z> pairwise combine, choose rightmost .El |