From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 1 Jan 2022 14:25:55 +0000 (+0000)
Subject: patch 8.2.3968: build failure
X-Git-Tag: v8.2.3968
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e70cec976026ce72d09b6589ebba4677581063ac;p=vim

patch 8.2.3968: build failure

Problem:    Build failure.
Solution:   Add missing changes.
---

diff --git a/src/strings.c b/src/strings.c
index 18b2cefb9..6abf89a35 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -916,7 +916,7 @@ string_filter_map(
 	    {
 		clear_tv(&newtv);
 		clear_tv(&tv);
-		emsg(_(e_stringreq));
+		emsg(_(e_string_required));
 		break;
 	    }
 	    else
@@ -956,7 +956,7 @@ string_reduce(
     {
 	if (*p == NUL)
 	{
-	    semsg(_(e_reduceempty), "String");
+	    semsg(_(e_reduce_of_an_empty_str_with_no_initial_value), "String");
 	    return;
 	}
 	if (copy_first_char_to_tv(p, rettv) == FAIL)
diff --git a/src/version.c b/src/version.c
index 337bcd5c5..5f9e63904 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3968,
 /**/
     3967,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 2b1408932..225f582b7 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1109,7 +1109,7 @@ get_var_dest(
 	*dest = dest_option;
 	if (cmdidx == CMD_final || cmdidx == CMD_const)
 	{
-	    emsg(_(e_const_option));
+	    emsg(_(e_cannot_lock_an_option));
 	    return FAIL;
 	}
 	p = name;