Merge pull request #36159 from janlazo/vim-8.2.3962

vim-patch:8.2.{2423,3962,3968,4773}

scripts/vim-patch.sh

@@ -282,6 +282,10 @@ preprocess_patch() {
   LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/profiler\.c/\1\/profile.c/g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"
 
+  # Rename regexp_(bt|nfa).c to regexp.c
+  LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/regexp_(bt|nfa)\.c/\1\/regexp.c/g' \
+    "$file" > "$file".tmp && mv "$file".tmp "$file"
+
   # Rename scriptfile.c to runtime.c
   LC_ALL=C sed -Ee 's/( [ab]\/src\/nvim)\/scriptfile\.c/\1\/runtime.c/g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"

src/nvim/arglist.c

@@ -68,8 +68,6 @@ typedef struct {
 
 static const char e_window_layout_changed_unexpectedly[]
   = N_("E249: Window layout changed unexpectedly");
-static const char e_cannot_change_arglist_recursively[]
-  = N_("E1156: Cannot change the argument list recursively");
 
 enum {
   AL_SET = 1,

src/nvim/errors.h

@@ -27,7 +27,6 @@ EXTERN const char e_while[] INIT(= N_("E588: :endwhile without :while"));
 EXTERN const char e_for[] INIT(= N_("E588: :endfor without :for"));
 EXTERN const char e_exists[] INIT(= N_("E13: File exists (add ! to override)"));
 EXTERN const char e_failed[] INIT(= N_("E472: Command failed"));
-EXTERN const char e_internal[] INIT(= N_("E473: Internal error"));
 EXTERN const char e_intern2[] INIT(= N_("E685: Internal error: %s"));
 EXTERN const char e_interr[] INIT(= N_("Interrupted"));
 EXTERN const char e_invarg[] INIT(= N_("E474: Invalid argument"));
@@ -37,6 +36,7 @@ EXTERN const char e_invargNval[] INIT(= N_("E475: Invalid value for argument %s:
 EXTERN const char e_duparg2[] INIT(= N_("E983: Duplicate argument: %s"));
 EXTERN const char e_invexpr2[] INIT(= N_("E15: Invalid expression: \"%s\""));
 EXTERN const char e_invrange[] INIT(= N_("E16: Invalid range"));
+EXTERN const char e_internal_error_in_regexp[] INIT(= N_("E473: Internal error in regexp"));
 EXTERN const char e_invcmd[] INIT(= N_("E476: Invalid command"));
 EXTERN const char e_isadir2[] INIT(= N_("E17: \"%s\" is a directory"));
 EXTERN const char e_no_spell[] INIT(= N_("E756: Spell checking is not possible"));
@@ -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"));
@@ -167,6 +166,7 @@ EXTERN const char e_no_more_directory_str_found_in_cdpath[] INIT(= N_("E346: No
 EXTERN const char e_no_more_file_str_found_in_path[] INIT(= N_("E347: No more file \"%s\" found in path"));
 
 EXTERN const char e_cannot_define_autocommands_for_all_events[] INIT(= N_("E1155: Cannot define autocommands for ALL events"));
+EXTERN const char e_cannot_change_arglist_recursively[] INIT(= N_("E1156: Cannot change the argument list recursively"));
 
 EXTERN const char e_resulting_text_too_long[] INIT(= N_("E1240: Resulting text too long"));
 
@@ -176,9 +176,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[]

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){

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);

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.

src/nvim/indent_c.c

@@ -559,7 +559,7 @@ static int cin_isdefault(const char *s)
          && s[1] != ':';
 }
 
-/// Recognize a scope declaration label set in 'cinscopedecls'.
+/// Recognize a scope declaration label from the 'cinscopedecls' option.
 static bool cin_isscopedecl(const char *p)
 {
   const char *s = cin_skipcomment(p);

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);

src/nvim/regexp.c

@@ -4370,7 +4370,8 @@ static uint8_t *regatom(int *flagp)
     if (one_exactly) {
       EMSG_ONE_RET_NULL;
     }
-    IEMSG_RET_NULL(_(e_internal));       // Supposed to be caught earlier.
+    // Supposed to be caught earlier.
+    IEMSG_RET_NULL(_(e_internal_error_in_regexp));
   // NOTREACHED
 
   case Magic('='):