patch 7.4.1220

Problem:    Warnings for unused variables in tiny build. (Tony Mechelynck)
Solution:   Move declarations inside #ifdef. (Hirohito Higashi)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index ba3efac9bb9824e82d24db82505742d8aa0676ca..66f1fa6c41d59774da9c1a0f84f8bc5317e040ec 100644 (file)
--- 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 1eab3eea52a7dbc452ff77a9ea9fc668011890c2..b2eeacb57bf63ca67f116ece9bd90700caa4d1a1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1220,
 /**/
     1219,
 /**/