mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Merge pull request #17480 from zeertzjq/vim-8.2.4427
vim-patch:8.2.4427: getchar() may return modifiers if no character is available
This commit is contained in:
commit
9fa46d3fd4
@ -3225,7 +3225,7 @@ static void getchar_common(typval_T *argvars, typval_T *rettv)
|
|||||||
set_vim_var_nr(VV_MOUSE_COL, 0);
|
set_vim_var_nr(VV_MOUSE_COL, 0);
|
||||||
|
|
||||||
rettv->vval.v_number = n;
|
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
|
char_u temp[10]; // modifier: 3, mbyte-char: 6, NUL: 1
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
||||||
|
@ -1451,6 +1451,10 @@ func Test_getchar()
|
|||||||
call assert_equal('', getcharstr(0))
|
call assert_equal('', getcharstr(0))
|
||||||
call assert_equal('', getcharstr(1))
|
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 setline(1, 'xxxx')
|
||||||
" call test_setmouse(1, 3)
|
" call test_setmouse(1, 3)
|
||||||
" let v:mouse_win = 9
|
" let v:mouse_win = 9
|
||||||
|
Loading…
Reference in New Issue
Block a user