diff options
| -rw-r--r-- | config.def.h | 4 | ||||
| -rw-r--r-- | main.c | 20 | ||||
| -rw-r--r-- | vis-motions.c | 8 | ||||
| -rw-r--r-- | vis.c | 2 | ||||
| -rw-r--r-- | vis.h | 4 |
5 files changed, 19 insertions, 19 deletions
diff --git a/config.def.h b/config.def.h index 4a170f9..1fba42a 100644 --- a/config.def.h +++ b/config.def.h @@ -83,8 +83,8 @@ static const KeyBinding bindings_motions[] = { { "l", ACTION(CURSOR_CHAR_NEXT) }, { "L", ACTION(CURSOR_WINDOW_LINE_BOTTOM) }, { "M", ACTION(CURSOR_WINDOW_LINE_MIDDLE) }, - { "n", ACTION(CURSOR_SEARCH_NEXT) }, - { "N", ACTION(CURSOR_SEARCH_PREV) }, + { "n", ACTION(CURSOR_SEARCH_REPEAT_FORWARD) }, + { "N", ACTION(CURSOR_SEARCH_REPEAT_BACKWARD) }, { "T", ACTION(TILL_LEFT) }, { "t", ACTION(TILL_RIGHT) }, { "W", ACTION(CURSOR_LONGWORD_START_NEXT) }, @@ -171,8 +171,8 @@ enum { VIS_ACTION_CURSOR_WINDOW_LINE_TOP, VIS_ACTION_CURSOR_WINDOW_LINE_MIDDLE, VIS_ACTION_CURSOR_WINDOW_LINE_BOTTOM, - VIS_ACTION_CURSOR_SEARCH_NEXT, - VIS_ACTION_CURSOR_SEARCH_PREV, + VIS_ACTION_CURSOR_SEARCH_REPEAT_FORWARD, + VIS_ACTION_CURSOR_SEARCH_REPEAT_BACKWARD, VIS_ACTION_CURSOR_SEARCH_WORD_FORWARD, VIS_ACTION_CURSOR_SEARCH_WORD_BACKWARD, VIS_ACTION_WINDOW_PAGE_UP, @@ -515,15 +515,15 @@ static const KeyAction vis_action[] = { VIS_HELP("Move cursor to bottom line of the window") movement, { .i = VIS_MOVE_WINDOW_LINE_BOTTOM } }, - [VIS_ACTION_CURSOR_SEARCH_NEXT] = { - "vis-motion-search-forward", - VIS_HELP("Move cursor to next match") - movement, { .i = VIS_MOVE_SEARCH_NEXT } + [VIS_ACTION_CURSOR_SEARCH_REPEAT_FORWARD] = { + "vis-motion-search-repeat-forward", + VIS_HELP("Move cursor to next match in forward direction") + movement, { .i = VIS_MOVE_SEARCH_REPEAT_FORWARD } }, - [VIS_ACTION_CURSOR_SEARCH_PREV] = { - "vis-motion-search-backward", - VIS_HELP("Move cursor to previous match") - movement, { .i = VIS_MOVE_SEARCH_PREV } + [VIS_ACTION_CURSOR_SEARCH_REPEAT_BACKWARD] = { + "vis-motion-search-repeat-backward", + VIS_HELP("Move cursor to previous match in backward direction") + movement, { .i = VIS_MOVE_SEARCH_REPEAT_BACKWARD } }, [VIS_ACTION_CURSOR_SEARCH_WORD_FORWARD] = { "vis-motion-search-word-forward", diff --git a/vis-motions.c b/vis-motions.c index 3e7f269..7007f47 100644 --- a/vis-motions.c +++ b/vis-motions.c @@ -328,9 +328,9 @@ bool vis_motion(Vis *vis, enum VisMotion motion, ...) { } text_regex_free(regex); if (motion == VIS_MOVE_SEARCH_FORWARD) - motion = VIS_MOVE_SEARCH_NEXT; + motion = VIS_MOVE_SEARCH_REPEAT_FORWARD; else - motion = VIS_MOVE_SEARCH_PREV; + motion = VIS_MOVE_SEARCH_REPEAT_BACKWARD; break; } case VIS_MOVE_RIGHT_TO: @@ -588,11 +588,11 @@ const Movement vis_motions[] = { .vis = search_word_backward, .type = JUMP, }, - [VIS_MOVE_SEARCH_NEXT] = { + [VIS_MOVE_SEARCH_REPEAT_FORWARD] = { .vis = search_forward, .type = JUMP, }, - [VIS_MOVE_SEARCH_PREV] = { + [VIS_MOVE_SEARCH_REPEAT_BACKWARD] = { .vis = search_backward, .type = JUMP, }, @@ -1459,7 +1459,7 @@ static void macro_replay_internal(Vis *vis, const Macro *macro) { bool vis_macro_replay(Vis *vis, enum VisRegister id) { if (id == VIS_REG_SEARCH) - return vis_motion(vis, VIS_MOVE_SEARCH_NEXT); + return vis_motion(vis, VIS_MOVE_SEARCH_REPEAT_FORWARD); if (id == VIS_REG_COMMAND) { const char *cmd = register_get(vis, &vis->registers[id], NULL); return vis_cmd(vis, cmd); @@ -302,8 +302,8 @@ enum VisMotion { VIS_MOVE_MARK_LINE, VIS_MOVE_SEARCH_WORD_FORWARD, VIS_MOVE_SEARCH_WORD_BACKWARD, - VIS_MOVE_SEARCH_NEXT, - VIS_MOVE_SEARCH_PREV, + VIS_MOVE_SEARCH_REPEAT_FORWARD, + VIS_MOVE_SEARCH_REPEAT_BACKWARD, VIS_MOVE_WINDOW_LINE_TOP, VIS_MOVE_WINDOW_LINE_MIDDLE, VIS_MOVE_WINDOW_LINE_BOTTOM, |