From 1df795756fd12c47aaa6593c459ae846d2186af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Sat, 19 Sep 2015 16:34:53 +0200 Subject: vis: consolidate all text objects into one mode --- config.def.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'config.def.h') 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] = { -- cgit v1.2.3