patch 7.4.1534

Problem:    Compiler warning for shadowed variable. (Kazunobu Kuriyama)
Solution:   Rename it.

diff --git a/src/eval.c b/src/eval.c
index 548c50b341651eafbdddf896755f1477cb7afd24..edb2b258d8234dec6216d48adf0a5fd42a91cc76 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -15197,13 +15197,13 @@ f_job_start(typval_T *argvars, typval_T *rettv)
            return;
        if (buf->b_ml.ml_mfp == NULL)
        {
-           char_u      buf[NUMBUFLEN];
+           char_u      numbuf[NUMBUFLEN];
            char_u      *s;
 
            if (opt.jo_set & JO_IN_BUF)
            {
-               sprintf((char *)buf, "%d", opt.jo_io_buf[PART_IN]);
-               s = buf;
+               sprintf((char *)numbuf, "%d", opt.jo_io_buf[PART_IN]);
+               s = numbuf;
            }
            else
                s = opt.jo_io_name[PART_IN];

diff --git a/src/version.c b/src/version.c
index 980f481f48a64af3d1d4a0630513b906f0bab448..e7bc3d89bf6ba0ecd73a92942b7e9ba9d68602b6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1534,
 /**/
     1533,
 /**/