summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-01-01 14:25:55 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-01 14:25:55 +0000
commite70cec976026ce72d09b6589ebba4677581063ac (patch)
tree12716d6fa12c4af849ac8e963527f73a35e5055c
parent460ae5dfca31fa627531c263184849976755cf6b (diff)
patch 8.2.3968: build failurev8.2.3968
Problem: Build failure. Solution: Add missing changes.
-rw-r--r--src/strings.c4
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/strings.c b/src/strings.c
index 18b2cefb97..6abf89a35b 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 337bcd5c5d..5f9e63904d 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 */
/**/
+ 3968,
+/**/
3967,
/**/
3966,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 2b14089321..225f582b7d 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;