vis

commit 9de39ebf8f448148fd051dc20a85d2fa89b8cfab
parent 0edafa1c0e2e54ea7b84625bbe7201ac0d38e813
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Mon,  3 Jul 2017 23:48:10 +0200

vis: process aliased key sequences individually

While the complete alias is added to the input queue,
the called key bindings should only see the keys they
have asked for.

Previously a mapping such as:

 :map! normal gv \"^Sv

did not work as expected because the key binding for
the register did reject an invalid multi letter register
name.

Might also influence #581

Diffstat:
M
vis.c
 | 
14
++++++++++++--

1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/vis.c b/vis.c
@@ -1185,12 +1185,22 @@ 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';
-				end = (char*)binding->action->func(vis, binding_end, &binding->action->arg);
+				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);
+				}
 				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);