kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1521: failing redo of command with control characters

Browse Source 
Problem:    Failing redo of command with control characters.
Solution:   Use AppendToRedobuffLit() for colon commands. (closes vim/vim#12354)

30b6d6104c
This commit is contained in:
zeertzjq 2023-05-08 00:41:18 +08:00
parent 3233137813
commit 5844af0d52
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/getchar.c
View File

@ -92,8 +92,8 @@ static buffheader_T readbuf2 = { { NULL, { NUL } }, NULL, 0, 0 };
static int typeahead_char = 0; // typeahead char that's not flushed
// when block_redo is true redo buffer will not be changed
// used by edit() to repeat insertions and 'V' command for redoing
/// When block_redo is true the redo buffer will not be changed.
/// Used by edit() to repeat insertions.
static int block_redo = false;
static int KeyNoremap = 0; // remapping flags
@ -558,6 +558,10 @@ void AppendToRedobuffLit(const char *str, int len)
/// and escaping other K_SPECIAL bytes.
void AppendToRedobuffSpec(const char *s)
{
if (block_redo) {
return;
}
while (*s != NUL) {
if ((uint8_t)(*s) == K_SPECIAL && s[1] != NUL && s[2] != NUL) {
// Insert special key literally.

6
src/nvim/ops.c
View File

@ -5858,7 +5858,11 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
if (repeat_cmdline == NULL) {
ResetRedobuff();
} else {
AppendToRedobuffSpec(repeat_cmdline);
if (cap->cmdchar == ':') {
AppendToRedobuffLit(repeat_cmdline, -1);
} else {
AppendToRedobuffSpec(repeat_cmdline);
}
AppendToRedobuff(NL_STR);
XFREE_CLEAR(repeat_cmdline);
}

23
test/old/testdir/test_normal.vim
View File

@ -3648,11 +3648,32 @@ func Test_horiz_motion()
bwipe!
endfunc
" Test for using a : command in operator pending mode
" Test for using a ":" command in operator pending mode
func Test_normal_colon_op()
new
call setline(1, ['one', 'two'])
call assert_beeps("normal! Gc:d\<CR>")
call assert_equal(['one'], getline(1, '$'))
call setline(1, ['one…two…three!'])
normal! $
" Using ":" as a movement is characterwise exclusive
call feedkeys("d:normal! F…\<CR>", 'xt')
call assert_equal(['one…two!'], getline(1, '$'))
" Check that redoing a command with 0x80 bytes works
call feedkeys('.', 'xt')
call assert_equal(['one!'], getline(1, '$'))
call setline(1, ['one', 'two', 'three', 'four', 'five'])
" Add this to the command history
call feedkeys(":normal! G0\<CR>", 'xt')
" Use :normal! with control characters in operator pending mode
call feedkeys("d:normal! \<C-V>\<C-P>\<C-V>\<C-P>\<CR>", 'xt')
call assert_equal(['one', 'two', 'five'], getline(1, '$'))
" Check that redoing a command with control characters works
call feedkeys('.', 'xt')
call assert_equal(['five'], getline(1, '$'))
bwipe!
endfunc