# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1341584522 -7200
# Node ID a34fb0a077c9c26946727a25222e0a99dc08db0d
# Parent  a9ef79b9f730de8bce318f1ff77ef9c7353a43ec
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)

diff --git a/src/buffer.c b/src/buffer.c
--- 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
--- 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,