patch 8.2.2062: <Cmd> does not handle CTRL-V
Problem: <Cmd> does not handle CTRL-V.
Solution: Call get_literal() after encountering CTRL-V. (closes #7387)
diff --git a/src/getchar.c b/src/getchar.c
index ad21cba..42eed4a 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3675,6 +3675,14 @@
}
c1 = TO_SPECIAL(c1, c2);
}
+ if (c1 == Ctrl_V)
+ {
+ // CTRL-V is followed by octal, hex or other characters, reverses
+ // what AppendToRedobuffLit() does.
+ no_reduce_keys = TRUE; // don't merge modifyOtherKeys
+ c1 = get_literal();
+ no_reduce_keys = FALSE;
+ }
if (got_int)
aborted = TRUE;
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 66edaa8..1750f39 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -972,6 +972,11 @@
unmap <F3>
unmap! <F3>
%bw!
+
+ " command line ending in "0" is handled without errors
+ onoremap ix <cmd>eval 0<cr>
+ call feedkeys('dix.', 'xt')
+ ounmap ix
endfunc
" text object enters visual mode
diff --git a/src/version.c b/src/version.c
index 395aee1..ef1c5db 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2062,
+/**/
2061,
/**/
2060,