diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-11-21 10:52:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-21 10:52:16 -0500 |
| commit | e192a4600af6db8c54f22c854cbabf0b071ca4bc (patch) | |
| tree | 2ad06e26f9fc5665ed61fca5b3ca5cea1e465f73 /src/nvim/eval/funcs.c | |
| parent | 3c2402e5c2641be27e8a526d78c2e0e544ec9cf8 (diff) | |
| parent | 2a5307202b02d47e26c4430a47db7a4cad422862 (diff) | |
| download | rneovim-e192a4600af6db8c54f22c854cbabf0b071ca4bc.tar.gz rneovim-e192a4600af6db8c54f22c854cbabf0b071ca4bc.tar.bz2 rneovim-e192a4600af6db8c54f22c854cbabf0b071ca4bc.zip | |
Merge pull request #13307 from janlazo/vim-8.1.0777
vim-patch:8.1.{323,777,933,938},8.2.{178,248,547,581,592,646,658,793,1608,1975,1991,1992,1993,1994,1998,1999,2003,2007,2008,2009}
Diffstat (limited to 'src/nvim/eval/funcs.c')
| -rw-r--r-- | src/nvim/eval/funcs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index eee40965e0..62a8022734 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -2987,11 +2987,12 @@ static void f_getchar(typval_T *argvars, typval_T *rettv, FunPtr fptr) // illegal argument or getchar(0) and no char avail: return zero n = 0; } else { - // getchar(0) and char avail: return char + // getchar(0) and char avail() != NUL: get a character. + // Note that vpeekc_any() returns K_SPECIAL for K_IGNORE. n = safe_vgetc(); } - if (n == K_IGNORE) { + if (n == K_IGNORE || n == K_VER_SCROLLBAR || n == K_HOR_SCROLLBAR) { continue; } break; |