vis

a vi-like editor based on Plan 9's structural regular expressions

git clone https://9o.is/git/vis.git

commit 25c4b2feef1d822ed30ab5a4e18a462754a82578
parent 844647dc377c4057e77d54d5aa08ceb154db3a61
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Tue, 11 Jul 2017 23:19:22 +0200

Revert "vis: process aliased key sequences individually"

This reverts commit 9de39ebf8f448148fd051dc20a85d2fa89b8cfab.

The key handling functions are called too often. This for example
causes problems for `r` (replace char) in combination with :langmap.

Diffstat:
Mvis.c | 14++------------
1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/vis.c b/vis.c @@ -1159,22 +1159,12 @@ static void vis_keys_process(Vis *vis, size_t pos) { strcpy(vis->key_prev, vis->key_current); strncpy(vis->key_current, start, len); vis->key_current[len] = '\0'; - char *params_end = binding_end; - while (params_end) { - tmp = *params_end; - *params_end = '\0'; - end = (char*)binding->action->func(vis, binding_end, &binding->action->arg); - *params_end = tmp; - if (end) { - start = cur = end; - break; - } - params_end = (char*)vis_keys_next(vis, params_end); - } + end = (char*)binding->action->func(vis, binding_end, &binding->action->arg); if (!end) { end = start; break; } + start = cur = end; } else if (binding->alias) { buffer_remove(buf, start - buf->data, binding_end - start); buffer_insert0(buf, start - buf->data, binding->alias);