diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-01-03 22:05:19 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-01-03 22:05:19 +0100 |
commit | 5f63938447f3eebd1fc4add999ff8d5b42899178 (patch) | |
tree | fecb138afb7bbf975f01d89db0a12e6cd8f5f919 | |
parent | 67977821270bd328cd37c4ace38fb97f21ad4fd5 (diff) |
patch 8.2.2292: Vim: expr test failsv8.2.2292
Problem: Vim: expr test fails.
Solution: Add missing part of "null" support.
-rw-r--r-- | src/eval.c | 9 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 75cbca96c5..571e96f70b 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3413,12 +3413,19 @@ eval7( ret = OK; } else if (len == 5 && in_vim9script() - && STRNCMP(s, "false", 4) == 0) + && STRNCMP(s, "false", 5) == 0) { rettv->v_type = VAR_BOOL; rettv->vval.v_number = VVAL_FALSE; ret = OK; } + else if (len == 4 && in_vim9script() + && STRNCMP(s, "null", 4) == 0) + { + rettv->v_type = VAR_SPECIAL; + rettv->vval.v_number = VVAL_NULL; + ret = OK; + } else ret = eval_variable(s, len, rettv, NULL, TRUE, FALSE); } diff --git a/src/version.c b/src/version.c index 4a42d49095..6b966286e5 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2292, +/**/ 2291, /**/ 2290, |