thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.1281: the "trailing characters" error can be hard to understand

Browse Source 
Problem:    The "trailing characters" error can be hard to understand.
Solution:   Add the trailing characters to the message.
This commit is contained in:
Bram Moolenaar 2020-07-23 17:16:18 +02:00
parent 8930caaa1a
commit 2d06bfde29
13 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmdhist.c
View File

@ -705,7 +705,7 @@ ex_history(exarg_T *eap)
else
{
*end = i;
emsg(_(e_trailing));
semsg(_(e_trailing_arg), arg);
return;
}
}
@ -717,7 +717,7 @@ ex_history(exarg_T *eap)
end = arg;
if (!get_list_range(&end, &hisidx1, &hisidx2) || *end != NUL)
{
emsg(_(e_trailing));
semsg(_(e_trailing_arg), end);
return;
}

2
src/eval.c
View File

@ -797,7 +797,7 @@ get_lval(
if (unlet && !VIM_ISWHITE(*p) && !ends_excmd(*p)
&& *p != '[' && *p != '.')
{
emsg(_(e_trailing));
semsg(_(e_trailing_arg), p);
return NULL;
}

4
src/evalfunc.c
View File

@ -2141,7 +2141,7 @@ f_eval(typval_T *argvars, typval_T *rettv)
rettv->vval.v_number = 0;
}
else if (*s != NUL)
emsg(_(e_trailing));
semsg(_(e_trailing_arg), s);
}
/*
@ -5113,7 +5113,7 @@ f_islocked(typval_T *argvars, typval_T *rettv)
if (end != NULL && lv.ll_name != NULL)
{
if (*end != NUL)
emsg(_(e_trailing));
semsg(_(e_trailing_arg), end);
else
{
if (lv.ll_tv == NULL)

10
src/evalvars.c
View File

@ -592,7 +592,7 @@ heredoc_get(exarg_T *eap, char_u *cmd, int script_get)
p = skiptowhite(marker);
if (*skipwhite(p) != NUL && *skipwhite(p) != '"')
{
emsg(_(e_trailing));
semsg(_(e_trailing_arg), p);
return NULL;
}
*p = NUL;
@ -1113,7 +1113,7 @@ list_arg_vars(exarg_T *eap, char_u *arg, int *first)
if (!VIM_ISWHITE(*arg) && !ends_excmd(*arg))
{
emsg_severe = TRUE;
emsg(_(e_trailing));
semsg(_(e_trailing_arg), arg);
break;
}
}
@ -1489,7 +1489,7 @@ ex_unletlock(
if (name_end != NULL)
{
emsg_severe = TRUE;
emsg(_(e_trailing));
semsg(_(e_trailing_arg), name_end);
}
if (!(eap->skip || error))
clear_lval(&lv);
@ -3431,9 +3431,9 @@ var_redir_start(char_u *name, int append)
clear_lval(redir_lval);
if (redir_endp != NULL && *redir_endp != NUL)
// Trailing characters are present after the variable name
emsg(_(e_trailing));
semsg(_(e_trailing_arg), redir_endp);
else
emsg(_(e_invarg));
semsg(_(e_invarg2), name);
redir_endp = NULL; // don't store a value, only cleanup
var_redir_stop();
return FAIL;

2
src/ex_cmds.c
View File

@ -3816,7 +3816,7 @@ do_sub(exarg_T *eap)
eap->nextcmd = check_nextcmd(cmd);
if (eap->nextcmd == NULL)
{
emsg(_(e_trailing));
semsg(_(e_trailing_arg), cmd);
return;
}
}

4
src/ex_docmd.c
View File

@ -2396,7 +2396,7 @@ do_one_cmd(
&& *ea.arg != '"' && (*ea.arg != '|' || (ea.argt & EX_TRLBAR) == 0))
{
// no arguments allowed but there is something
errormsg = _(e_trailing);
errormsg = ex_errmsg(e_trailing_arg, ea.arg);
goto doend;
}
@ -7725,7 +7725,7 @@ ex_mark(exarg_T *eap)
if (*eap->arg == NUL) // No argument?
emsg(_(e_argreq));
else if (eap->arg[1] != NUL) // more than one character?
emsg(_(e_trailing));
semsg(_(e_trailing_arg), eap->arg);
else
{
pos = curwin->w_cursor; // save curwin->w_cursor

2
src/ex_eval.c
View File

@ -1588,7 +1588,7 @@ ex_catch(exarg_T *eap)
if (end != NULL && *end != NUL
&& !ends_excmd2(end, skipwhite(end + 1)))
{
emsg(_(e_trailing));
semsg(_(e_trailing_arg), end);
return;
}

2
src/json.c
View File

@ -1086,7 +1086,7 @@ json_decode_all(js_read_T *reader, typval_T *res, int options)
json_skip_white(reader);
if (reader->js_buf[reader->js_used] != NUL)
{
emsg(_(e_trailing));
semsg(_(e_trailing_arg), reader->js_buf + reader->js_used);
return FAIL;
}
return OK;

2
src/menu.c
View File

@ -289,7 +289,7 @@ ex_menu(
}
else if (*map_to != NUL && (unmenu || enable != MAYBE))
{
emsg(_(e_trailing));
semsg(_(e_trailing_arg), map_to);
goto theend;
}
#if defined(FEAT_GUI) && !(defined(FEAT_GUI_GTK) || defined(FEAT_GUI_PHOTON))

2
src/quickfix.c
View File

@ -3579,7 +3579,7 @@ qf_list(exarg_T *eap)
}
if (!get_list_range(&arg, &idx1, &idx2) || *arg != NUL)
{
emsg(_(e_trailing));
semsg(_(e_trailing_arg), arg);
return;
}
qfl = qf_get_curlist(qi);

2
src/sign.c
View File

@ -1577,7 +1577,7 @@ parse_sign_cmd_args(
filename = arg;
*buf = buflist_findnr((int)getdigits(&arg));
if (*skipwhite(arg) != NUL)
emsg(_(e_trailing));
semsg(_(e_trailing_arg), arg);
break;
}
else

8
src/userfunc.c
View File

@ -2664,7 +2664,7 @@ def_function(exarg_T *eap, char_u *name_arg)
{
if (!ends_excmd(*skipwhite(p)))
{
emsg(_(e_trailing));
semsg(_(e_trailing_arg), p);
goto ret_free;
}
eap->nextcmd = check_nextcmd(p);
@ -2833,7 +2833,7 @@ def_function(exarg_T *eap, char_u *name_arg)
&& !(*p == '#' && (vim9script || eap->cmdidx == CMD_def))
&& !eap->skip
&& !did_emsg)
emsg(_(e_trailing));
semsg(_(e_trailing_arg), p);
/*
* Read the body of the function, until "}", ":endfunction" or ":enddef" is
@ -3629,7 +3629,7 @@ ex_delfunction(exarg_T *eap)
if (!ends_excmd(*skipwhite(p)))
{
vim_free(name);
emsg(_(e_trailing));
semsg(_(e_trailing_arg), p);
return;
}
eap->nextcmd = check_nextcmd(p);
@ -3977,7 +3977,7 @@ ex_call(exarg_T *eap)
if (!failed)
{
emsg_severe = TRUE;
emsg(_(e_trailing));
semsg(_(e_trailing_arg), arg);
}
}
else

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1281,
/**/
1280,
/**/