aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.587

Browse Source 
Problem:    Compiler warning for local var shadowing global var.
Solution:   Rename the var and move it to an inner block. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar 2012-07-06 16:22:02 +02:00
parent 95b557b1dc
commit e25865a7f3
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/buffer.c
View File

@ -1363,9 +1363,6 @@ set_curbuf(buf, action)
int action; int action;
{ {
buf_T *prevbuf; buf_T *prevbuf;
#ifdef FEAT_WINDOWS
win_T *prevwin;
#endif
int unload = (action == DOBUF_UNLOAD || action == DOBUF_DEL int unload = (action == DOBUF_UNLOAD || action == DOBUF_DEL
|| action == DOBUF_WIPE); || action == DOBUF_WIPE);
@ -1406,7 +1403,7 @@ set_curbuf(buf, action)
#endif #endif
{ {
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
prevwin = curwin; win_T *previouswin = curwin;
#endif #endif
if (prevbuf == curbuf) if (prevbuf == curbuf)
u_sync(FALSE); u_sync(FALSE);
@ -1415,9 +1412,9 @@ set_curbuf(buf, action)
&& !P_HID(prevbuf) && !P_HID(prevbuf)
&& !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE); && !bufIsChanged(prevbuf)) ? DOBUF_UNLOAD : 0, FALSE);
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
if (curwin != prevwin && win_valid(prevwin)) if (curwin != previouswin && win_valid(previouswin))
/* autocommands changed curwin, Grr! */ /* autocommands changed curwin, Grr! */
curwin = prevwin; curwin = previouswin;
#endif #endif
} }
} }

2
src/version.c
View File

@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
587,
/**/ /**/
586, 586,
/**/ /**/