diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-04-09 17:58:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-09 17:58:49 +0100 |
| commit | 81b46a6ccd818609e1ca8cd410e26a58428c30ba (patch) | |
| tree | c1fabec0ac2a5470e3e347ebb5a873bb2243b629 | |
| parent | 36951ed1dab2b2e816dc8959c72b5732f36d9e3b (diff) | |
patch 8.2.4722: ending recording with mapping records too muchv8.2.4722
Problem: When a recording is ended with a mapped key that key is also
recorded.
Solution: Remember the previous last_recorded_len. (closes #10122)
| -rw-r--r-- | src/getchar.c | 10 | ||||
| -rw-r--r-- | src/testdir/test_registers.vim | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 32 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c index 29ad56e6a1..fb7f00a95f 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -1705,10 +1705,16 @@ vgetc(void) } else { + // number of characters recorded from the last vgetc() call + static int last_vgetc_recorded_len = 0; + mod_mask = 0; vgetc_mod_mask = 0; vgetc_char = 0; - last_recorded_len = 0; + + // last_recorded_len can be larger than last_vgetc_recorded_len + // if peeking records more + last_recorded_len -= last_vgetc_recorded_len; for (;;) // this is done twice if there are modifiers { @@ -1910,6 +1916,8 @@ vgetc(void) break; } + + last_vgetc_recorded_len = last_recorded_len; } #ifdef FEAT_EVAL diff --git a/src/testdir/test_registers.vim b/src/testdir/test_registers.vim index 51543c00c1..3522649812 100644 --- a/src/testdir/test_registers.vim +++ b/src/testdir/test_registers.vim @@ -759,6 +759,27 @@ func Test_record_in_select_mode() bwipe! endfunc +" mapping that ends macro recording should be removed from recorded macro +func Test_end_record_using_mapping() + call setline(1, 'aaa') + nnoremap s q + call feedkeys('safas', 'tx') + call assert_equal('fa', @a) + nunmap s + + nnoremap xx q + call feedkeys('0xxafaxx', 'tx') + call assert_equal('fa', @a) + nunmap xx + + nnoremap xsx q + call feedkeys('0qafaxsx', 'tx') + call assert_equal('fa', @a) + nunmap xsx + + bwipe! +endfunc + func Test_end_reg_executing() nnoremap s <Nop> let @a = 's' diff --git a/src/version.c b/src/version.c index 1b2a1886b0..410fe2aa59 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4722, +/**/ 4721, /**/ 4720, |