diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-07-13 04:08:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-13 04:08:49 +0800 |
| commit | 39d51c833aed7e2ab946cd51bfff8d981269a8ef (patch) | |
| tree | 45f677120aeb74205f476f7b9ee7b1d1c93a8852 /src/nvim/eval/funcs.c | |
| parent | b1e0197a143b3cc04c6a6fe8f064671391f6c8b4 (diff) | |
| download | rneovim-39d51c833aed7e2ab946cd51bfff8d981269a8ef.tar.gz rneovim-39d51c833aed7e2ab946cd51bfff8d981269a8ef.tar.bz2 rneovim-39d51c833aed7e2ab946cd51bfff8d981269a8ef.zip | |
vim-patch:8.2.0035: saving and restoring called_emsg is clumsy (#19335)
Problem: Saving and restoring called_emsg is clumsy.
Solution: Count the number of error messages.
https://github.com/vim/vim/commit/53989554a44caca0964376d60297f08ec257c53c
Diffstat (limited to 'src/nvim/eval/funcs.c')
| -rw-r--r-- | src/nvim/eval/funcs.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 6466e06010..63c25fe815 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -3902,15 +3902,14 @@ static void f_wait(typval_T *argvars, typval_T *rettv, FunPtr fptr) typval_T argv = TV_INITIAL_VALUE; typval_T exprval = TV_INITIAL_VALUE; bool error = false; - int save_called_emsg = called_emsg; - called_emsg = false; + const int called_emsg_before = called_emsg; LOOP_PROCESS_EVENTS_UNTIL(&main_loop, main_loop.events, timeout, eval_expr_typval(&expr, &argv, 0, &exprval) != OK || tv_get_number_chk(&exprval, &error) - || called_emsg || error || got_int); + || called_emsg > called_emsg_before || error || got_int); - if (called_emsg || error) { + if (called_emsg > called_emsg_before || error) { rettv->vval.v_number = -3; } else if (got_int) { got_int = false; @@ -3920,8 +3919,6 @@ static void f_wait(typval_T *argvars, typval_T *rettv, FunPtr fptr) rettv->vval.v_number = 0; } - called_emsg = save_called_emsg; - // Stop dummy timer time_watcher_stop(tw); time_watcher_close(tw, dummy_timer_close_cb); |