diff options
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 7da9502fd6..dab3afb212 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -2378,6 +2378,7 @@ int eval1(char **arg, typval_T *rettv, evalarg_T *const evalarg) *arg = skipwhite(*arg + 1); evalarg_used->eval_flags = result ? orig_flags : orig_flags & ~EVAL_EVALUATE; if (eval1(arg, rettv, evalarg_used) == FAIL) { + evalarg_used->eval_flags = orig_flags; return FAIL; } @@ -2388,17 +2389,19 @@ int eval1(char **arg, typval_T *rettv, evalarg_T *const evalarg) if (evaluate && result) { tv_clear(rettv); } + evalarg_used->eval_flags = orig_flags; return FAIL; } // Get the third variable. Recursive! *arg = skipwhite(*arg + 1); - typval_T var2; evalarg_used->eval_flags = !result ? orig_flags : orig_flags & ~EVAL_EVALUATE; + typval_T var2; if (eval1(arg, &var2, evalarg_used) == FAIL) { if (evaluate && result) { tv_clear(rettv); } + evalarg_used->eval_flags = orig_flags; return FAIL; } if (evaluate && !result) { |