diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-04-29 22:30:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-04-29 22:30:13 +0200 |
| commit | dfc33a665d3b12689aa971575b8e7de4e5202d83 (patch) | |
| tree | 8c046a483c6b78d558f9ad178ed7e9369c4efe5c /src/evalfunc.c | |
| parent | 339d60c89bef0315343a6128a1b4826510b0efe4 (diff) | |
| download | vim-git-dfc33a665d3b12689aa971575b8e7de4e5202d83.tar.gz | |
patch 8.2.0662: cannot use input() in a channel callbackv8.2.0662
Problem: Cannot use input() in a channel callback.
Solution: Reset vgetc_busy. (closes #6010)
Diffstat (limited to 'src/evalfunc.c')
| -rw-r--r-- | src/evalfunc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 02943c717..149329195 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -2149,7 +2149,7 @@ f_eval(typval_T *argvars, typval_T *rettv) static void f_eventhandler(typval_T *argvars UNUSED, typval_T *rettv) { - rettv->vval.v_number = vgetc_busy; + rettv->vval.v_number = vgetc_busy || input_busy; } static garray_T redir_execute_ga; @@ -2566,7 +2566,7 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED) #ifdef FEAT_TIMERS || timer_busy #endif - ) + || input_busy) typebuf_was_filled = TRUE; } vim_free(keys_esc); @@ -2887,7 +2887,7 @@ f_funcref(typval_T *argvars, typval_T *rettv) } static type_T * -ret_f_function(int argcount, type_T **argtypes UNUSED) +ret_f_function(int argcount, type_T **argtypes) { if (argcount == 1 && argtypes[0]->tt_type == VAR_STRING) return &t_func_any; |