mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
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)
This commit is contained in:
@@ -1637,7 +1637,11 @@ merge_modifyOtherKeys(int c_arg, int *modifiers)
|
||||
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 @@ inchar(
|
||||
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;
|
||||
|
Reference in New Issue
Block a user