]> granicus.if.org Git - vim/commitdiff
patch 8.2.3968: build failure v8.2.3968
authorBram Moolenaar <Bram@vim.org>
Sat, 1 Jan 2022 14:25:55 +0000 (14:25 +0000)
committerBram Moolenaar <Bram@vim.org>
Sat, 1 Jan 2022 14:25:55 +0000 (14:25 +0000)
Problem:    Build failure.
Solution:   Add missing changes.

src/strings.c
src/version.c
src/vim9compile.c

index 18b2cefb97921fc14e3ed02b000969d4b917c1c6..6abf89a35b83bcf542b90ceb2a919479b8f44415 100644 (file)
@@ -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)
index 337bcd5c5d2724acd281fb4dcc60f55df98cfeff..5f9e63904d1154e6e5afd2caade3a0b650ea169c 100644 (file)
@@ -749,6 +749,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3968,
 /**/
     3967,
 /**/
index 2b14089321e9abb01bc0baeb86283472d1afc010..225f582b7da64acbcb6ab75c8bf3e7a3552dbc05 100644 (file)
@@ -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;