IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4722: ending recording with mapping records too much (#18060)

Browse Source 
Problem:    When a recording is ended with a mapped key that key is also
            recorded.
Solution:   Remember the previous last_recorded_len. (closes vim/vim#10122)
81b46a6ccd
This commit is contained in:
zeertzjq 2022-04-10 06:45:27 +08:00 committed by GitHub
parent 2a2c4e191f
commit 12662ac0c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/getchar.c
View File

@ -1469,8 +1469,14 @@ int vgetc(void)
mouse_row = old_mouse_row;
mouse_col = old_mouse_col;
} else {
// number of characters recorded from the last vgetc() call
static size_t last_vgetc_recorded_len = 0;
mod_mask = 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
bool did_inc = false;
@ -1621,6 +1627,8 @@ int vgetc(void)
break;
}
last_vgetc_recorded_len = last_recorded_len;
}
/*

21
src/nvim/testdir/test_registers.vim
View File

@ -690,6 +690,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'