mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 02:46:31 +00: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
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);
}