From 3a058c2bec89cb12817a56c65119bb81b134c000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Thu, 14 Jan 2016 21:28:58 +0100 Subject: vis: more cleanups --- vis-core.h | 4 +--- vis-modes.c | 6 +++++- vis.c | 4 ---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/vis-core.h b/vis-core.h index a1f4797..195b784 100644 --- a/vis-core.h +++ b/vis-core.h @@ -169,15 +169,13 @@ extern Movement vis_motions[VIS_MOVE_INVALID]; extern Operator vis_operators[VIS_OP_INVALID]; extern TextObject vis_textobjects[VIS_TEXTOBJECT_INVALID]; -void action_do(Vis *vis, Action *a); - void macro_operator_stop(Vis *vis); void macro_operator_record(Vis *vis); +void action_do(Vis *vis, Action *a); void action_reset(Action*); void mode_set(Vis *vis, Mode *new_mode); -Mode *mode_get(Vis *vis, enum VisMode mode); void window_selection_save(Win *win); diff --git a/vis-modes.c b/vis-modes.c index 64b10d0..21bef53 100644 --- a/vis-modes.c +++ b/vis-modes.c @@ -1,7 +1,7 @@ #include "vis-core.h" #include "util.h" -Mode *mode_get(Vis *vis, enum VisMode mode) { +static Mode *mode_get(Vis *vis, enum VisMode mode) { if (mode < LENGTH(vis_modes)) return &vis_modes[mode]; return NULL; @@ -20,6 +20,10 @@ void mode_set(Vis *vis, Mode *new_mode) { vis->win->ui->draw_status(vis->win->ui); } +void vis_mode_switch(Vis *vis, enum VisMode mode) { + mode_set(vis, &vis_modes[mode]); +} + static bool mode_map(Mode *mode, const char *key, const KeyBinding *binding) { if (!mode) return false; diff --git a/vis.c b/vis.c index f5e82d3..e08a788 100644 --- a/vis.c +++ b/vis.c @@ -1030,10 +1030,6 @@ int vis_run(Vis *vis, int argc, char *argv[]) { return vis->exit_status; } -void vis_mode_switch(Vis *vis, enum VisMode mode) { - mode_set(vis, &vis_modes[mode]); -} - static Macro *macro_get(Vis *vis, enum VisMacro m) { if (m == VIS_MACRO_LAST_RECORDED) return vis->last_recording; -- cgit v1.2.3