summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-04-10 18:21:30 +0200
committerBram Moolenaar <Bram@vim.org>2021-04-10 18:21:30 +0200
commit87795939d01932b0d8155fd69c7494fa51c523f3 (patch)
treed41a1a378e1ca01826280ae1f6b420f9dc201c9e
parent51e7e78de7320a734ddc2d7931e767bccaf7e6f2 (diff)
downloadvim-git-87795939d01932b0d8155fd69c7494fa51c523f3.tar.gz
patch 8.2.2746: check for duplicate arguments does not workv8.2.2746
Problem: Check for duplicate arguments does not work. Solution: Correct condition.
-rw-r--r--src/userfunc.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/userfunc.c b/src/userfunc.c
index 018542681..522112607 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -109,7 +109,7 @@ one_function_arg(
return arg;
}
is_underscore = arg_copy[0] == '_' && arg_copy[1] == NUL;
- if (argtypes != NULL && !is_underscore)
+ if (argtypes == NULL || !is_underscore)
// Check for duplicate argument name.
for (i = 0; i < newargs->ga_len; ++i)
if (STRCMP(((char_u **)(newargs->ga_data))[i], arg_copy) == 0)
diff --git a/src/version.c b/src/version.c
index 346b5d1f0..bbbc92abb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2746,
+/**/
2745,
/**/
2744,