From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 3 Jan 2021 21:05:19 +0000 (+0100)
Subject: patch 8.2.2292: Vim: expr test fails
X-Git-Tag: v8.2.2292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f63938447f3eebd1fc4add999ff8d5b42899178;p=vim

patch 8.2.2292: Vim: expr test fails

Problem:    Vim: expr test fails.
Solution:   Add missing part of "null" support.
---

diff --git a/src/eval.c b/src/eval.c
index 75cbca96c..571e96f70 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 4a42d4909..6b966286e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2292,
 /**/
     2291,
 /**/