From e61dad45417b78d4f4dbbac3b6e9c986cec82ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Wed, 10 Sep 2014 22:45:55 +0200 Subject: Clean up normal mode key bindings --- config.def.h | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/config.def.h b/config.def.h index 6c5e274..9cc77b1 100644 --- a/config.def.h +++ b/config.def.h @@ -123,6 +123,8 @@ static KeyBinding vis_movements[] = { { { NONE('g'), NONE('g') }, movement, { .i = MOVE_FILE_BEGIN } }, { { NONE('G') }, movement, { .i = MOVE_LINE } }, { { NONE('|') }, movement, { .i = MOVE_COLUMN } }, + { { NONE('n') }, movement, { .i = MOVE_SEARCH_FORWARD } }, + { { NONE('N') }, movement, { .i = MOVE_SEARCH_BACKWARD } }, { { NONE('f') }, movement_key, { .i = MOVE_RIGHT_TO } }, { { NONE('F') }, movement_key, { .i = MOVE_LEFT_TO } }, { { NONE('t') }, movement_key, { .i = MOVE_RIGHT_TILL } }, @@ -330,34 +332,32 @@ static KeyBinding vis_marks_set[] = { }; static KeyBinding vis_normal[] = { - { { CONTROL('w'), NONE('s') }, split, { NULL } }, - { { CONTROL('w'), NONE('j') }, call, { .f = editor_window_next } }, - { { CONTROL('w'), NONE('k') }, call, { .f = editor_window_prev } }, - { { CONTROL('F') }, cursor, { .m = window_page_up } }, - { { CONTROL('B') }, cursor, { .m = window_page_down } }, - { { NONE('A') }, insertmode, { .i = MOVE_LINE_END } }, - { { NONE('C') }, change, { .i = MOVE_LINE_END } }, - { { NONE('D') }, delete, { .i = MOVE_LINE_END } }, - { { NONE('I') }, insertmode, { .i = MOVE_LINE_START } }, - { { NONE('.') }, repeat, { } }, - { { NONE('n') }, movement, { .i = MOVE_SEARCH_FORWARD } }, - { { NONE('N') }, movement, { .i = MOVE_SEARCH_BACKWARD } }, - { { NONE('o') }, openline, { .i = MOVE_LINE_NEXT } }, - { { NONE('O') }, openline, { .i = MOVE_LINE_PREV } }, - { { NONE('J') }, joinline, { .i = MOVE_LINE_NEXT } }, - { { NONE('x') }, call, { .f = editor_delete_key } }, - { { NONE('r') }, replace, { NULL } }, - { { NONE('i') }, switchmode, { .i = VIS_MODE_INSERT } }, - { { NONE('v') }, switchmode, { .i = VIS_MODE_VISUAL } }, - { { NONE('R') }, switchmode, { .i = VIS_MODE_REPLACE} }, - { { NONE('S') }, operator_twice, { .i = OP_CHANGE } }, - { { NONE('s') }, change, { .i = MOVE_CHAR_NEXT } }, - { { NONE('Y') }, operator_twice, { .i = OP_YANK } }, - { { NONE('u') }, undo, { NULL } }, - { { CONTROL('R') }, redo, { NULL } }, - { { CONTROL('L') }, call, { .f = editor_draw } }, - { { NONE(':') }, prompt, { .s = ":" } }, - { /* empty last element, array terminator */ }, + { { CONTROL('w'), NONE('s') }, split, { NULL } }, + { { CONTROL('w'), NONE('j') }, call, { .f = editor_window_next } }, + { { CONTROL('w'), NONE('k') }, call, { .f = editor_window_prev } }, + { { CONTROL('F') }, cursor, { .m = window_page_up } }, + { { CONTROL('B') }, cursor, { .m = window_page_down } }, + { { NONE('A') }, insertmode, { .i = MOVE_LINE_END } }, + { { NONE('C') }, change, { .i = MOVE_LINE_END } }, + { { NONE('D') }, delete, { .i = MOVE_LINE_END } }, + { { NONE('I') }, insertmode, { .i = MOVE_LINE_START } }, + { { NONE('.') }, repeat, { NULL } }, + { { NONE('o') }, openline, { .i = MOVE_LINE_NEXT } }, + { { NONE('O') }, openline, { .i = MOVE_LINE_PREV } }, + { { NONE('J') }, joinline, { .i = MOVE_LINE_NEXT } }, + { { NONE('x') }, call, { .f = editor_delete_key } }, + { { NONE('r') }, replace, { NULL } }, + { { NONE('i') }, switchmode, { .i = VIS_MODE_INSERT } }, + { { NONE('v') }, switchmode, { .i = VIS_MODE_VISUAL } }, + { { NONE('R') }, switchmode, { .i = VIS_MODE_REPLACE } }, + { { NONE('S') }, operator_twice, { .i = OP_CHANGE } }, + { { NONE('s') }, change, { .i = MOVE_CHAR_NEXT } }, + { { NONE('Y') }, operator_twice, { .i = OP_YANK } }, + { { NONE('u') }, undo, { NULL } }, + { { CONTROL('R') }, redo, { NULL } }, + { { CONTROL('L') }, call, { .f = editor_draw } }, + { { NONE(':') }, prompt, { .s = ":" } }, + { /* empty last element, array terminator */ }, }; static KeyBinding vis_visual[] = { -- cgit v1.2.3