aboutsummaryrefslogtreecommitdiff
path: root/vis.c
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2016-01-12 15:48:17 +0100
committerMarc André Tanner <mat@brain-dump.org>2016-01-13 21:38:19 +0100
commit11ede8254974aba6e1ef318ab90374fb85e6bf5c (patch)
tree248276ff41ce2efe9bc0280e54905dc977a45c6d /vis.c
parent24bf7a500ecad7091f92cf9063d0b6cbbf678db1 (diff)
downloadvis-11ede8254974aba6e1ef318ab90374fb85e6bf5c.tar.gz
vis-11ede8254974aba6e1ef318ab90374fb85e6bf5c.tar.xz
vis: cleanup key binding definitions
This removes the tree based mode structures and instead merges all keybindings in flat modes which uses some more memory but will allow (per mode) run-time configurable key bindings. Make sure to update/remove config.h.
Diffstat (limited to 'vis.c')
-rw-r--r--vis.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vis.c b/vis.c
index 6ccd584..7af4654 100644
--- a/vis.c
+++ b/vis.c
@@ -604,7 +604,7 @@ static void action_do(Vis *vis, Action *a) {
} else {
vis_prompt_show(vis, ":", "'<,'>!");
}
- } else if (vis->mode == &vis_modes[VIS_MODE_OPERATOR]) {
+ } else if (vis->mode == &vis_modes[VIS_MODE_OPERATOR_PENDING]) {
mode_set(vis, vis->mode_prev);
} else if (vis->mode->visual) {
vis_mode_switch(vis, VIS_MODE_NORMAL);
@@ -966,7 +966,7 @@ bool vis_operator(Vis *vis, enum VisOperator id, ...) {
/* switch to operator mode inorder to make operator options and
* text-object available */
- vis_mode_switch(vis, VIS_MODE_OPERATOR);
+ vis_mode_switch(vis, VIS_MODE_OPERATOR_PENDING);
if (vis->action.op == op) {
/* hacky way to handle double operators i.e. things like
* dd, yy etc where the second char isn't a movement */