Permalink
Browse files

updated for version 7.3.325

Problem:    A duplicated function argument gives an internal error.
Solution:   Give a proper error message. (based on patch by Tyru)
  • Loading branch information...
1 parent f8a94ed commit dc75ffcab33f7d91be2e4c8882e1bec31d342502 @brammool brammool committed Sep 30, 2011
Showing with 12 additions and 0 deletions.
  1. +10 −0 src/eval.c
  2. +2 −0 src/version.c
View
@@ -20461,6 +20461,7 @@ ex_function(eap)
exarg_T *eap;
{
char_u *theline;
+ int i;
int j;
int c;
int saved_did_emsg;
@@ -20707,6 +20708,15 @@ ex_function(eap)
arg = vim_strsave(arg);
if (arg == NULL)
goto erret;
+
+ /* Check for duplicate argument name. */
+ for (i = 0; i < newargs.ga_len; ++i)
+ if (STRCMP(((char_u **)(newargs.ga_data))[i], arg) == 0)
+ {
+ EMSG2(_("E853: Duplicate argument name: %s"), arg);
+ goto erret;
+ }
+
((char_u **)(newargs.ga_data))[newargs.ga_len] = arg;
*p = c;
newargs.ga_len++;
View
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 325,
+/**/
324,
/**/
323,

0 comments on commit dc75ffc

Please sign in to comment.