patch 8.2.3961: error messages are spread out
Problem: Error messages are spread out.
Solution: Move more errors to errors.h.
diff --git a/src/evalvars.c b/src/evalvars.c
index 03ed5c1..381bda4 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -792,7 +792,7 @@
{
// ":let" without "=": list variables
if (*arg == '[')
- emsg(_(e_invarg));
+ emsg(_(e_invalid_argument));
else if (expr[0] == '.' && expr[1] == '=')
emsg(_("E985: .= is not supported with script version >= 2"));
else if (!ends_excmd2(eap->cmd, arg))
@@ -1049,7 +1049,7 @@
if (s == p)
{
if (!silent)
- semsg(_(e_invarg2), p);
+ semsg(_(e_invalid_argument_str), p);
return NULL;
}
++*var_count;
@@ -1069,7 +1069,7 @@
else if (*p != ',')
{
if (!silent)
- semsg(_(e_invarg2), p);
+ semsg(_(e_invalid_argument_str), p);
return NULL;
}
}
@@ -1220,7 +1220,7 @@
if (len < 0 && !aborting())
{
emsg_severe = TRUE;
- semsg(_(e_invarg2), arg);
+ semsg(_(e_invalid_argument_str), arg);
break;
}
error = TRUE;
@@ -1316,7 +1316,7 @@
name = arg;
len = get_env_len(&arg);
if (len == 0)
- semsg(_(e_invarg2), name - 1);
+ semsg(_(e_invalid_argument_str), name - 1);
else
{
if (op != NULL && vim_strchr((char_u *)"+-*/%", *op) != NULL)
@@ -1606,7 +1606,7 @@
clear_lval(&lv);
}
else
- semsg(_(e_invarg2), arg);
+ semsg(_(e_invalid_argument_str), arg);
return arg_end;
}
@@ -1668,7 +1668,7 @@
++arg;
if (get_env_len(&arg) == 0)
{
- semsg(_(e_invarg2), arg - 1);
+ semsg(_(e_invalid_argument_str), arg - 1);
return;
}
if (!error && !eap->skip
@@ -4016,7 +4016,7 @@
// Catch a bad name early.
if (!eval_isnamec1(*name))
{
- emsg(_(e_invarg));
+ emsg(_(e_invalid_argument));
return FAIL;
}
@@ -4044,7 +4044,7 @@
// Trailing characters are present after the variable name
semsg(_(e_trailing_arg), redir_endp);
else
- semsg(_(e_invarg2), name);
+ semsg(_(e_invalid_argument_str), name);
redir_endp = NULL; // don't store a value, only cleanup
var_redir_stop();
return FAIL;