diff options
| -rw-r--r-- | vis-core.h | 5 | ||||
| -rw-r--r-- | vis-motions.c | 4 | ||||
| -rw-r--r-- | vis.c | 2 |
3 files changed, 4 insertions, 7 deletions
@@ -164,11 +164,8 @@ struct Vis { /** stuff used by multiple of the vis-* files */ -/* TODO: make part of Vis struct? enable dynamic modes? */ extern Mode vis_modes[VIS_MODE_INVALID]; - -extern Movement moves[VIS_MOVE_INVALID]; - +extern Movement vis_motions[VIS_MOVE_INVALID]; extern Operator vis_operators[VIS_OP_INVALID]; extern TextObject vis_textobjects[VIS_TEXTOBJECT_INVALID]; diff --git a/vis-motions.c b/vis-motions.c index c0f7ab7..2ee6f60 100644 --- a/vis-motions.c +++ b/vis-motions.c @@ -245,7 +245,7 @@ bool vis_motion(Vis *vis, enum VisMotion motion, ...) { break; } - vis->action.movement = &moves[motion]; + vis->action.movement = &vis_motions[motion]; va_end(ap); action_do(vis, &vis->action); return true; @@ -254,7 +254,7 @@ err: return false; } -Movement moves[] = { +Movement vis_motions[] = { [VIS_MOVE_LINE_UP] = { .cur = view_line_up, .type = LINEWISE }, [VIS_MOVE_LINE_DOWN] = { .cur = view_line_down, .type = LINEWISE }, [VIS_MOVE_SCREEN_LINE_UP] = { .cur = view_screenline_up, }, @@ -699,7 +699,7 @@ void action_do(Vis *vis, Action *a) { if (a->op) { /* we do not support visual repeat, still do something resonable */ if (vis->mode->visual && !a->movement && !a->textobj) - a->movement = &moves[VIS_MOVE_NOP]; + a->movement = &vis_motions[VIS_MOVE_NOP]; /* operator implementations must not change the mode, * they might get called multiple times (once for every cursor) |