diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-07-06 16:22:02 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-07-06 16:22:02 +0200 |
| commit | e25865a7f32d9e6feab0b6b61b76f074ee16f0c9 (patch) | |
| tree | 7a1643f4f687db3d6a9f9e8597c3dcff278fb1f1 | |
| parent | 95b557b1dcaa3ac3912f93b56c43ec662d9f7d93 (diff) | |
updated for version 7.3.587v7.3.587
Problem: Compiler warning for local var shadowing global var.
Solution: Rename the var and move it to an inner block. (Christian Brabandt)
| -rw-r--r-- | src/buffer.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c index c84e6d5850..ba4692a594 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1363,9 +1363,6 @@ set_curbuf(buf, action) int action; { buf_T *prevbuf; -#ifdef FEAT_WINDOWS - win_T *prevwin; -#endif int unload = (action == DOBUF_UNLOAD || action == DOBUF_DEL || action == DOBUF_WIPE); @@ -1406,7 +1403,7 @@ set_curbuf(buf, action) #endif { #ifdef FEAT_WINDOWS - prevwin = curwin; + win_T *previouswin = curwin; #endif if (prevbuf == curbuf) u_sync(FALSE); @@ -1415,9 +1412,9 @@ set_curbuf(buf, action) && !P_HID(prevbuf) && !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE); #ifdef FEAT_WINDOWS - if (curwin != prevwin && win_valid(prevwin)) + if (curwin != previouswin && win_valid(previouswin)) /* autocommands changed curwin, Grr! */ - curwin = prevwin; + curwin = previouswin; #endif } } diff --git a/src/version.c b/src/version.c index b7f9b5b93f..1314e41e60 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 587, +/**/ 586, /**/ 585, |