diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-02-21 06:04:56 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-02-21 06:06:01 +0800 |
| commit | 3828fb7ea431c9ceec815c41aed89c50ab9712f5 (patch) | |
| tree | 117eaed1e946468ab1b65bf4ce503b975562d5f2 | |
| parent | d80c9b925973be87d1d5a2e948d65907234b2134 (diff) | |
| download | rneovim-3828fb7ea431c9ceec815c41aed89c50ab9712f5.tar.gz rneovim-3828fb7ea431c9ceec815c41aed89c50ab9712f5.tar.bz2 rneovim-3828fb7ea431c9ceec815c41aed89c50ab9712f5.zip | |
vim-patch:8.2.4427: getchar() may return modifiers if no character is available
Problem: getchar() may return modifiers if no character is available.
Solution: Do not process modifiers when there is no character. (closes vim/vim#9806)
https://github.com/vim/vim/commit/ad6c45f62558e03d3e3a927b3fe4dbaf30a36bef
| -rw-r--r-- | src/nvim/eval/funcs.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_functions.vim | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index c6baa105b0..3763390c22 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -3225,7 +3225,7 @@ static void getchar_common(typval_T *argvars, typval_T *rettv) set_vim_var_nr(VV_MOUSE_COL, 0); rettv->vval.v_number = n; - if (IS_SPECIAL(n) || mod_mask != 0) { + if (n != 0 && (IS_SPECIAL(n) || mod_mask != 0)) { char_u temp[10]; // modifier: 3, mbyte-char: 6, NUL: 1 int i = 0; diff --git a/src/nvim/testdir/test_functions.vim b/src/nvim/testdir/test_functions.vim index 6e36f4e3d2..994d74601a 100644 --- a/src/nvim/testdir/test_functions.vim +++ b/src/nvim/testdir/test_functions.vim @@ -1451,6 +1451,10 @@ func Test_getchar() call assert_equal('', getcharstr(0)) call assert_equal('', getcharstr(1)) + call feedkeys("\<M-F2>", '') + call assert_equal("\<M-F2>", getchar(0)) + call assert_equal(0, getchar(0)) + call setline(1, 'xxxx') " call test_setmouse(1, 3) " let v:mouse_win = 9 |