diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-03-11 18:52:22 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-03-11 18:52:22 +0100 |
commit | 846cdb227526272e2cd8ecba4f7168e2226cd633 (patch) | |
tree | 66038e50fa47f8625629de528ef8735e4c468339 /src | |
parent | 74c5bbf13435a7ab1e3461078bbcb1200f0451e1 (diff) | |
download | vim-git-846cdb227526272e2cd8ecba4f7168e2226cd633.tar.gz |
patch 7.4.1534v7.4.1534
Problem: Compiler warning for shadowed variable. (Kazunobu Kuriyama)
Solution: Rename it.
Diffstat (limited to 'src')
-rw-r--r-- | src/eval.c | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
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 @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1534, +/**/ 1533, /**/ 1532, |