Mercurial > vim
diff src/eval.c @ 21925:51d591dbb8df v8.2.1512
patch 8.2.1512: failure after trinary expression fails
Commit: https://github.com/vim/vim/commit/69e44552c567ff25b363ba0790ad3d43fa0397a7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 22 22:37:20 2020 +0200
patch 8.2.1512: failure after trinary expression fails
Problem: Failure after trinary expression fails.
Solution: Restore eval_flags. (Yasuhiro Matsumoto, closes https://github.com/vim/vim/issues/6776)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 22 Aug 2020 22:45:03 +0200 |
| parents | 2559dc02bd64 |
| children | e6608764248a |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -2167,7 +2167,10 @@ eval1(char_u **arg, typval_T *rettv, eva 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, eva 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, eva { 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, eva { 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, eva { if (evaluate && result) clear_tv(rettv); + evalarg_used->eval_flags = orig_flags; return FAIL; } if (evaluate && !result)