# HG changeset patch # User Christian Brabandt # Date 1457719206 -3600 # Node ID ce789e3dc84d04e0ad9236700b8a8b9fa476eb59 # Parent 5ede4fe1aed5cc6f4df9f9466d8045310cf1d786 commit https://github.com/vim/vim/commit/846cdb227526272e2cd8ecba4f7168e2226cd633 Author: Bram Moolenaar Date: Fri Mar 11 18:52:22 2016 +0100 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 --- a/src/eval.c +++ b/src/eval.c @@ -15197,13 +15197,13 @@ f_job_start(typval_T *argvars, typval_T 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 --- 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 */ /**/ + 1534, +/**/ 1533, /**/ 1532,