From: Bram Moolenaar Date: Fri, 11 Mar 2016 17:52:22 +0000 (+0100) Subject: patch 7.4.1534 X-Git-Tag: v7.4.1534 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=846cdb227526272e2cd8ecba4f7168e2226cd633;p=vim 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 548c50b34..edb2b258d 100644 --- 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 980f481f4..e7bc3d89b 100644 --- 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, /**/