neovim

commit 24675ffa97d464783647beab1c9eb59d475fde3a
parent f211af3ab747ef06969d936baafd3f348f818259
Author: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date:   Sun, 12 Oct 2025 23:12:57 -0400

vim-patch:8.2.3968: build failure

Problem:    Build failure.
Solution:   Add missing changes.

https://github.com/vim/vim/commit/e70cec976026ce72d09b6589ebba4677581063ac

Co-authored-by: Bram Moolenaar <Bram@vim.org>

Diffstat:
M
src/nvim/errors.h
 | 
5
++++-
M
src/nvim/eval/funcs.c
 | 
7
+++----
M
src/nvim/eval/list.c
 | 
2
+-
M
src/nvim/eval/vars.c
 | 
2
+-
M
src/nvim/quickfix.c
 | 
2
+-

5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/nvim/errors.h b/src/nvim/errors.h
@@ -93,7 +93,6 @@ EXTERN const char e_letwrong[] INIT(= N_("E734: Wrong variable type for %s="));
 EXTERN const char e_illvar[] INIT(= N_("E461: Illegal variable name: %s"));
 EXTERN const char e_cannot_mod[] INIT(= N_("E995: Cannot modify existing variable"));
 EXTERN const char e_readonlyvar[] INIT(= N_("E46: Cannot change read-only variable \"%.*s\""));
-EXTERN const char e_stringreq[] INIT(= N_("E928: String required"));
 EXTERN const char e_dictreq[] INIT(= N_("E715: Dictionary required"));
 EXTERN const char e_blobidx[] INIT(= N_("E979: Blob index out of range: %" PRId64));
 EXTERN const char e_invalblob[] INIT(= N_("E978: Invalid operation for Blob"));
@@ -176,9 +175,13 @@ EXTERN const char e_highlight_group_name_invalid_char[] INIT(= N_("E5248: Invali
 
 EXTERN const char e_highlight_group_name_too_long[] INIT(= N_("E1249: Highlight group name too long"));
 
+EXTERN const char e_string_required[] INIT(= N_("E928: String required"));
+
 EXTERN const char e_invalid_column_number_nr[] INIT( = N_("E964: Invalid column number: %ld"));
 EXTERN const char e_invalid_line_number_nr[] INIT(= N_("E966: Invalid line number: %ld"));
 
+EXTERN const char e_reduce_of_an_empty_str_with_no_initial_value[] INIT(= N_("E998: Reduce of an empty %s with no initial value"));
+
 EXTERN const char e_stray_closing_curly_str[]
 INIT(= N_("E1278: Stray '}' without a matching '{': %s"));
 EXTERN const char e_missing_close_curly_str[]
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c
@@ -160,7 +160,6 @@ PRAGMA_DIAG_POP
 static const char *e_invalwindow = N_("E957: Invalid window number");
 static const char e_invalid_submatch_number_nr[]
   = N_("E935: Invalid submatch number: %d");
-static const char *e_reduceempty = N_("E998: Reduce of an empty %s with no initial value");
 static const char e_string_list_or_blob_required[]
   = N_("E1098: String, List or Blob required");
 static const char e_missing_function_argument[]
@@ -5356,7 +5355,7 @@ static void reduce_list(typval_T *argvars, typval_T *expr, typval_T *rettv)
   const listitem_T *li = NULL;
   if (argvars[2].v_type == VAR_UNKNOWN) {
     if (tv_list_len(l) == 0) {
-      semsg(_(e_reduceempty), "List");
+      semsg(_(e_reduce_of_an_empty_str_with_no_initial_value), "List");
       return;
     }
     const listitem_T *const first = tv_list_first(l);
@@ -5403,7 +5402,7 @@ static void reduce_string(typval_T *argvars, typval_T *expr, typval_T *rettv)
 
   if (argvars[2].v_type == VAR_UNKNOWN) {
     if (*p == NUL) {
-      semsg(_(e_reduceempty), "String");
+      semsg(_(e_reduce_of_an_empty_str_with_no_initial_value), "String");
       return;
     }
     len = utfc_ptr2len(p);
@@ -5451,7 +5450,7 @@ static void reduce_blob(typval_T *argvars, typval_T *expr, typval_T *rettv)
   int i;
   if (argvars[2].v_type == VAR_UNKNOWN) {
     if (tv_blob_len(b) == 0) {
-      semsg(_(e_reduceempty), "Blob");
+      semsg(_(e_reduce_of_an_empty_str_with_no_initial_value), "Blob");
       return;
     }
     initial = (typval_T){
diff --git a/src/nvim/eval/list.c b/src/nvim/eval/list.c
@@ -249,7 +249,7 @@ static void filter_map_string(const char *str, filtermap_T filtermap, typval_T *
       if (newtv.v_type != VAR_STRING) {
         tv_clear(&newtv);
         tv_clear(&tv);
-        emsg(_(e_stringreq));
+        emsg(_(e_string_required));
         break;
       } else {
         ga_concat(&ga, newtv.vval.v_string);
diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c
@@ -2606,7 +2606,7 @@ static OptVal tv_to_optval(typval_T *tv, OptIndex opt_idx, const char *option, b
       value = CSTR_TO_OPTVAL(strval);
     } else if (!is_tty_opt) {
       err = true;
-      emsg(_(e_stringreq));
+      emsg(_(e_string_required));
     }
   } else {
     abort();  // This should never happen.
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
@@ -7716,7 +7716,7 @@ static void set_qf_ll_list(win_T *wp, typval_T *args, typval_T *rettv)
     // Option argument was not given.
     goto skip_args;
   } else if (action_arg->v_type != VAR_STRING) {
-    emsg(_(e_stringreq));
+    emsg(_(e_string_required));
     return;
   }
   const char *const act = tv_get_string_chk(action_arg);