summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-31 14:13:21 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-31 14:13:21 +0100
commitfa399af7ece091203bd70ebcf955bf07a820beff (patch)
tree2a1564600d44e4a9f1ce86e92b3e1a765d5e88d5
parent937204a9175d0fe2f13c8bc4ebeb043003d7e7d7 (diff)
patch 7.4.1220v7.4.1220
Problem: Warnings for unused variables in tiny build. (Tony Mechelynck) Solution: Move declarations inside #ifdef. (Hirohito Higashi)
-rw-r--r--src/ex_cmds.c14
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 7 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index ba3efac9bb..66f1fa6c41 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -6586,19 +6586,19 @@ static void helptags_one(char_u *dir, char_u *ext, char_u *lang, int add_help_ta
void
ex_helptags(exarg_T *eap)
{
- garray_T ga;
- int i, j;
- int len;
-#ifdef FEAT_MULTI_LANG
- char_u lang[2];
-#endif
expand_T xpc;
char_u *dirname;
+ int add_help_tags = FALSE;
+#ifdef FEAT_MULTI_LANG
+ int len;
+ int i, j;
+ garray_T ga;
+ char_u lang[2];
char_u ext[5];
char_u fname[8];
int filecount;
char_u **files;
- int add_help_tags = FALSE;
+#endif
/* Check for ":helptags ++t {dir}". */
if (STRNCMP(eap->arg, "++t", 3) == 0 && vim_iswhite(eap->arg[3]))
diff --git a/src/version.c b/src/version.c
index 1eab3eea52..b2eeacb57b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1220,
+/**/
1219,
/**/
1218,