diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-21 21:31:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-21 21:31:00 +0200 |
| commit | c71f36a889897aca4ac2ad3828926e3801728336 (patch) | |
| tree | 2cd6028abac44a7f20aa8e7efbae08a4068ddfc3 /src/eval.c | |
| parent | f868ba89039045b25efe83d12ca501d657e170e8 (diff) | |
patch 8.2.1263: Vim9: comperators use 'ignorecase' in Vim9 scriptv8.2.1263
Problem: Vim9: comperators use 'ignorecase' in Vim9 script.
Solution: Ignore 'ignorecase'. Use true and false instead of 1 and 0.
(closes #6497)
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/eval.c b/src/eval.c index 307a2aec7d..c3f0ee5c9f 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2413,13 +2413,11 @@ eval3(char_u **arg, typval_T *rettv, evalarg_T *evalarg) static int eval4(char_u **arg, typval_T *rettv, evalarg_T *evalarg) { - typval_T var2; char_u *p; int getnext; int i; exptype_T type = EXPR_UNKNOWN; int len = 2; - int ic; /* * Get the first variable. @@ -2472,6 +2470,10 @@ eval4(char_u **arg, typval_T *rettv, evalarg_T *evalarg) */ if (type != EXPR_UNKNOWN) { + typval_T var2; + int ic; + int vim9script = in_vim9script(); + if (getnext) *arg = eval_next_line(evalarg); @@ -2487,9 +2489,9 @@ eval4(char_u **arg, typval_T *rettv, evalarg_T *evalarg) ic = FALSE; ++len; } - // nothing appended: use 'ignorecase' + // nothing appended: use 'ignorecase' if not in Vim script else - ic = p_ic; + ic = vim9script ? FALSE : p_ic; /* * Get the second variable. @@ -2504,8 +2506,7 @@ eval4(char_u **arg, typval_T *rettv, evalarg_T *evalarg) { int ret; - if (in_vim9script() && check_compare_types( - type, rettv, &var2) == FAIL) + if (vim9script && check_compare_types(type, rettv, &var2) == FAIL) { ret = FAIL; clear_tv(rettv); |