patch 8.2.4829: a key may be simplified to NUL
Problem: A key may be simplified to NUL.
Solution: Use K_ZERO instead. Use macros instead of hard coded values.
(closes #10290)
diff --git a/src/getchar.c b/src/getchar.c
index 73cf420..4caa89e 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1637,7 +1637,11 @@
if (*modifiers & MOD_MASK_CTRL)
{
if ((c >= '`' && c <= 0x7f) || (c >= '@' && c <= '_'))
+ {
c &= 0x1f;
+ if (c == NUL)
+ c = K_ZERO;
+ }
else if (c == '6')
// CTRL-6 is equivalent to CTRL-^
c = 0x1e;
@@ -3661,7 +3665,7 @@
for (;;)
{
len = ui_inchar(dum, DUM_LEN, 0L, 0);
- if (len == 0 || (len == 1 && dum[0] == 3))
+ if (len == 0 || (len == 1 && dum[0] == Ctrl_C))
break;
}
return retesc;
diff --git a/src/misc2.c b/src/misc2.c
index c23c689..6641a27 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1561,7 +1561,7 @@
key = Ctrl_chr(key);
modifiers &= ~MOD_MASK_CTRL;
// <C-@> is <Nul>
- if (key == 0)
+ if (key == NUL)
key = K_ZERO;
if (did_simplify != NULL)
*did_simplify = TRUE;
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 6e4bbd1..ddbe707 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -2437,5 +2437,11 @@
call assert_notequal(-1, index(output, 'builtin_dumb'))
endfunc
+func Test_simplify_ctrl_at()
+ " feeding unsimplified CTRL-@ should still trigger i_CTRL-@
+ call feedkeys("ifoo\<Esc>A\<*C-@>", 'xt')
+ call assert_equal('foofoo', getline(1))
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 945b6a1..54f350b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4829,
+/**/
4828,
/**/
4827,