summaryrefslogtreecommitdiff
path: root/src/evalfunc.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-06-24 16:03:06 +0200
committerBram Moolenaar <Bram@vim.org>2017-06-24 16:03:06 +0200
commit1e8e14552e0cc8881411eb8fbe39a654dae42554 (patch)
treef28d457d94b1ac4db1fe700f23bb31d428e674d5 /src/evalfunc.c
parent24a9e348aa88a6c60ae0cdf5c4a777d8c03b08ca (diff)
downloadvim-git-8.0.0670.tar.gz
patch 8.0.0670: can't use input() in a timer callbackv8.0.0670
Problem: Can't use input() in a timer callback. (Cosmin Popescu) Solution: Reset vgetc_busy and set timer_busy. (Ozaki Kiichi, closes #1790, closes #1129)
Diffstat (limited to 'src/evalfunc.c')
-rw-r--r--src/evalfunc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 7c781d8b9..581ad7b5b 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3191,7 +3191,7 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED)
ins_typebuf(keys_esc, (remap ? REMAP_YES : REMAP_NONE),
insert ? 0 : typebuf.tb_len, !typed, FALSE);
vim_free(keys_esc);
- if (vgetc_busy)
+ if (vgetc_busy || timer_busy)
typebuf_was_filled = TRUE;
if (execute)
{