Permalink
Browse files

updated for version 7.3.587

Problem:    Compiler warning for local var shadowing global var.
Solution:   Rename the var and move it to an inner block. (Christian Brabandt)
  • Loading branch information...
1 parent fc328fd commit 7d6e890e90dc22b06be5faacb0d57f39dfa51598 @brammool brammool committed Jul 6, 2012
Showing with 5 additions and 6 deletions.
  1. +3 −6 src/buffer.c
  2. +2 −0 src/version.c
View
@@ -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
}
}
View
@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 587,
/**/
586,
/**/

0 comments on commit 7d6e890

Please sign in to comment.