diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2015-09-19 16:34:53 +0200 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2015-10-05 16:29:52 +0200 |
| commit | 1df795756fd12c47aaa6593c459ae846d2186af0 (patch) | |
| tree | 5b519536f05116eaa3ce05823ad7550e0d4600de | |
| parent | 97947adeca4b81a2da0fc5506df46b6e68a86074 (diff) | |
| download | vis-1df795756fd12c47aaa6593c459ae846d2186af0.tar.gz vis-1df795756fd12c47aaa6593c459ae846d2186af0.tar.xz | |
vis: consolidate all text objects into one mode
| -rw-r--r-- | config.def.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/config.def.h b/config.def.h index f37b9e6..fd6ce07 100644 --- a/config.def.h +++ b/config.def.h @@ -14,7 +14,6 @@ enum { VIS_MODE_BASIC, VIS_MODE_MOVE, VIS_MODE_TEXTOBJ, - VIS_MODE_INNER_TEXTOBJ, VIS_MODE_OPERATOR, VIS_MODE_OPERATOR_OPTION, VIS_MODE_NORMAL, @@ -163,10 +162,6 @@ static KeyBinding vis_textobjs[] = { { "ae", textobj, { .i = TEXT_OBJ_OUTER_ENTIRE } }, { "af", textobj, { .i = TEXT_OBJ_OUTER_FUNCTION } }, { "al", textobj, { .i = TEXT_OBJ_OUTER_LINE } }, - { /* empty last element, array terminator */ }, -}; - -static KeyBinding vis_inner_textobjs[] = { { "iw", textobj, { .i = TEXT_OBJ_INNER_WORD } }, { "iW", textobj, { .i = TEXT_OBJ_INNER_LONGWORD } }, { "is", textobj, { .i = TEXT_OBJ_SENTENCE } }, @@ -187,7 +182,7 @@ static KeyBinding vis_inner_textobjs[] = { { "ie", textobj, { .i = TEXT_OBJ_INNER_ENTIRE } }, { "if", textobj, { .i = TEXT_OBJ_INNER_FUNCTION } }, { "il", textobj, { .i = TEXT_OBJ_INNER_LINE } }, - { /* empty last element, array terminator */ }, + { /* empty last element, array terminator */ }, }; static KeyBinding vis_operators[] = { @@ -516,16 +511,10 @@ static Mode vis_modes[] = { .parent = &vis_modes[VIS_MODE_BASIC], .default_bindings = vis_movements, }, - [VIS_MODE_INNER_TEXTOBJ] = { - .name = "INNER-TEXTOBJ", - .common_prefix = true, - .parent = &vis_modes[VIS_MODE_MOVE], - .default_bindings = vis_inner_textobjs, - }, [VIS_MODE_TEXTOBJ] = { .name = "TEXTOBJ", .common_prefix = true, - .parent = &vis_modes[VIS_MODE_INNER_TEXTOBJ], + .parent = &vis_modes[VIS_MODE_MOVE], .default_bindings = vis_textobjs, }, [VIS_MODE_OPERATOR_OPTION] = { |