summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-15 13:09:53 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-15 13:09:53 +0100
commit4f118be2bb987cdf313da879d2a93ae125e99202 (patch)
tree1e034edd5889819179e14e5c208ed34502324d40
parentf1551964448607f8222de2d8f0992ea43eb2fe67 (diff)
patch 7.4.1566v7.4.1566
Problem: Compiler warning for shadowed variable. (Kazunobu Kuriyama) Solution: Remove the inner one.
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index 425ab688f9..fd028ccce6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8759,8 +8759,6 @@ call_func(
}
if (error == ERROR_NONE && partial->pt_argc > 0)
{
- int i;
-
for (argv_clear = 0; argv_clear < partial->pt_argc; ++argv_clear)
copy_tv(&partial->pt_argv[argv_clear], &argv[argv_clear]);
for (i = 0; i < argcount_in; ++i)
diff --git a/src/version.c b/src/version.c
index 59c7714c88..e4004f81c3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1566,
+/**/
1565,
/**/
1564,