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
index c84e6d58502e218735128785e5fad03efa08f31a..ba4692a5948378fa13a210006496a66e00eb15a7 100644 (file)
--- 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 b7f9b5b93f9258f0c53f3ce80c0fdb8ccd640454..1314e41e60334c2905ae5990e2d4f40f39464e7d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    587,
 /**/
     586,
 /**/