diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/getchar.c | 23 | ||||
| -rw-r--r-- | src/nvim/testdir/test_termcodes.vim | 16 |
2 files changed, 27 insertions, 12 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 5aba241d45..a26ca3f2c8 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -2025,22 +2025,21 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth) if ((mp == NULL || max_mlen > mp_match_len) && keylen != KEYLEN_PART_MAP) { // When no matching mapping found or found a non-matching mapping that // matches at least what the matching mapping matched: - // Try to include the modifier into the key, when: - // - mapping is allowed, - // - keys have not been mapped, - // - and when not timed out, - if ((no_mapping == 0 || allow_keys != 0) - && (typebuf.tb_maplen == 0 - || (p_remap && typebuf.tb_noremap[typebuf.tb_off] == RM_YES)) - && !*timedout) { + // Try to include the modifier into the key when mapping is allowed. + if (no_mapping == 0 || allow_keys != 0) { if (tb_c1 == K_SPECIAL && (typebuf.tb_len < 2 - || (typebuf.tb_buf[typebuf.tb_off + 1] == KS_MODIFIER - && typebuf.tb_len < 4))) { + || (typebuf.tb_buf[typebuf.tb_off + 1] == KS_MODIFIER && typebuf.tb_len < 4))) { // Incomplete modifier sequence: cannot decide whether to simplify yet. keylen = KEYLEN_PART_KEY; - // Don't simplify if 'pastetoggle' matched partially. - } else if (keylen != KEYLEN_PART_KEY) { + } else if (keylen == KEYLEN_PART_KEY && !*timedout) { + // If 'pastetoggle' matched partially, don't simplify. + // When the last characters were not typed, don't wait for a typed character to + // complete 'pastetoggle'. + if (typebuf.tb_len == typebuf.tb_maplen) { + keylen = 0; + } + } else { // Try to include the modifier into the key. keylen = check_simplify_modifier(max_mlen + 1); if (keylen < 0) { diff --git a/src/nvim/testdir/test_termcodes.vim b/src/nvim/testdir/test_termcodes.vim index 987889f33c..f3b10a922e 100644 --- a/src/nvim/testdir/test_termcodes.vim +++ b/src/nvim/testdir/test_termcodes.vim @@ -6,5 +6,21 @@ func Test_simplify_ctrl_at() bw! endfunc +func Test_simplify_noremap() + call feedkeys("i\<*C-M>", 'nx') + call assert_equal('', getline(1)) + call assert_equal([0, 2, 1, 0, 1], getcurpos()) + bw! +endfunc + +func Test_simplify_timedout() + inoremap <C-M>a b + call feedkeys("i\<*C-M>", 'xt') + call assert_equal('', getline(1)) + call assert_equal([0, 2, 1, 0, 1], getcurpos()) + iunmap <C-M>a + bw! +endfunc + " vim: shiftwidth=2 sts=2 expandtab |