From 17c95d9608370559441bb73941ba6d9a4b6b26bd Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 26 Apr 2022 12:51:07 +0100 Subject: 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) --- src/getchar.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/getchar.c') diff --git a/src/getchar.c b/src/getchar.c index 73cf4208be..4caa89eb3f 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -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; -- cgit v1.2.3