IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4829: a key may be simplified to NUL

Browse Source 
Problem:    A key may be simplified to NUL.
Solution:   Use K_ZERO instead.  Use macros instead of hard coded values.
            (closes vim/vim#10290)
17c95d9608
This commit is contained in:
zeertzjq 2022-04-27 20:28:58 +08:00
parent f2b512ad75
commit bf065d9bb6
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/getchar.c
View File

@ -1450,7 +1450,7 @@ int merge_modifiers(int c_arg, int *modifiers)
if (*modifiers & MOD_MASK_CTRL) { if (*modifiers & MOD_MASK_CTRL) {
if ((c >= '`' && c <= 0x7f) || (c >= '@' && c <= '_')) { if ((c >= '`' && c <= 0x7f) || (c >= '@' && c <= '_')) {
c &= 0x1f; c &= 0x1f;
if (c == 0) { if (c == NUL) {
c = K_ZERO; c = K_ZERO;
} }
} else if (c == '6') { } else if (c == '6') {
@ -2738,7 +2738,7 @@ int inchar(char_u *buf, int maxlen, long wait_time)
for (;;) { for (;;) {
len = os_inchar(dum, DUM_LEN, 0L, 0, NULL); len = os_inchar(dum, DUM_LEN, 0L, 0, NULL);
if (len == 0 || (len == 1 && dum[0] == 3)) { if (len == 0 || (len == 1 && dum[0] == Ctrl_C)) {
break; break;
} }
} }

2
src/nvim/keymap.c
View File

@ -785,7 +785,7 @@ static int extract_modifiers(int key, int *modp, const bool simplify, bool *cons
&& ((key >= '?' && key <= '_') || ASCII_ISALPHA(key))) { && ((key >= '?' && key <= '_') || ASCII_ISALPHA(key))) {
key = CTRL_CHR(key); key = CTRL_CHR(key);
modifiers &= ~MOD_MASK_CTRL; modifiers &= ~MOD_MASK_CTRL;
if (key == 0) { // <C-@> is <Nul> if (key == NUL) { // <C-@> is <Nul>
key = K_ZERO; key = K_ZERO;
} }
if (did_simplify != NULL) { if (did_simplify != NULL) {

9
src/nvim/testdir/test_termcodes.vim Normal file
View File

@ -0,0 +1,9 @@
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