From f3b0b071cdb0db623a4b9de54e99f6f46dc261ac Mon Sep 17 00:00:00 2001 From: Koichi Murase Date: Sun, 27 Jun 2021 20:37:16 +0900 Subject: [PATCH 3/3] readline (rl_trim_arg_from_keyseq): support vi-arg-digit and multiple calls of digit-argument --- lib/readline/bind.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/readline/bind.c b/lib/readline/bind.c index fdd61e9b..643ac149 100644 --- a/lib/readline/bind.c +++ b/lib/readline/bind.c @@ -890,9 +890,12 @@ rl_trim_arg_from_keyseq (const char *keyseq, size_t len, Keymap map) { register int i, parsing_digits; unsigned char ic; + Keymap map0; + rl_command_func_t *func; if (map == 0) map = _rl_keymap; + map0 = map; /* The digits following the initial one (e.g., the binding to digit-argument) or the optional `-' in a binding to digit-argument or universal-argument @@ -904,9 +907,9 @@ rl_trim_arg_from_keyseq (const char *keyseq, size_t len, Keymap map) if (parsing_digits) { - if (_rl_digit_p (ic) == 0) - return (i); - continue; + if (_rl_digit_p (ic)) + continue; + parsing_digits = 0; } if (map[ic].type == ISKMAP) @@ -918,25 +921,27 @@ rl_trim_arg_from_keyseq (const char *keyseq, size_t len, Keymap map) } if (map[ic].type == ISFUNC) { - if (map[ic].function != rl_digit_argument && map[ic].function != rl_universal_argument) - return -1; + func = map[ic].function; + if (func != rl_digit_argument && func != rl_universal_argument && func != rl_vi_arg_digit) + return (i); /* We don't bother with a keyseq that is only a numeric argument */ if (i + 1 == len) return -1; + map = map0; parsing_digits = 1; /* This logic should be identical to rl_digit_loop */ /* We accept M-- as equivalent to M--1, C-u- as equivalent to C-u-1 but set parsing_digits to 2 to note that we saw `-' */ - if (map[ic].function == rl_universal_argument && (i + 1 == '-')) + if (func == rl_universal_argument && (i + 1 == '-')) { i++; parsing_digits = 2; continue; } - if (map[ic].function == rl_digit_argument && ic == '-') + if (func == rl_digit_argument && ic == '-') { parsing_digits = 2; continue; -- 2.21.3