diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-22 22:37:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-22 22:37:20 +0200 |
| commit | 69e44552c567ff25b363ba0790ad3d43fa0397a7 (patch) | |
| tree | 061de28c194fbf25ef55c960377a033ed2080525 /src/eval.c | |
| parent | cd94277f72e29b740635da84bcd872c96e11bf67 (diff) | |
patch 8.2.1512: failure after trinary expression failsv8.2.1512
Problem: Failure after trinary expression fails.
Solution: Restore eval_flags. (Yasuhiro Matsumoto, closes #6776)
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index 4b1e0f19bb..056ac76c2a 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2167,7 +2167,10 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg) 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; + } /* * Check for the ":". @@ -2178,6 +2181,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg) emsg(_(e_missing_colon)); if (evaluate && result) clear_tv(rettv); + evalarg_used->eval_flags = orig_flags; return FAIL; } if (getnext) @@ -2188,6 +2192,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg) { error_white_both(p, 1); clear_tv(rettv); + evalarg_used->eval_flags = orig_flags; return FAIL; } *arg = p; @@ -2200,6 +2205,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg) { error_white_both(p, 1); clear_tv(rettv); + evalarg_used->eval_flags = orig_flags; return FAIL; } *arg = skipwhite_and_linebreak(*arg + 1, evalarg_used); @@ -2209,6 +2215,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg) { if (evaluate && result) clear_tv(rettv); + evalarg_used->eval_flags = orig_flags; return FAIL; } if (evaluate && !result) |