updated for version 7.0-220

diff --git a/src/eval.c b/src/eval.c
index 4698024c2694c6ce8bfe3edee6b8c940df468494..93d039467d8fc4528bad048ba73703260be6a3a1 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -15769,7 +15769,15 @@ get_winnr(tp, argvar)
     if (nr > 0)
        for (wp = (tp == curtab) ? firstwin : tp->tp_firstwin;
                                              wp != twin; wp = wp->w_next)
+       {
+           if (wp == NULL)
+           {
+               /* didn't find it in this tabpage */
+               nr = 0;
+               break;
+           }
            ++nr;
+       }
     return nr;
 }
 #endif

diff --git a/src/version.c b/src/version.c
index d58ae293b6a2273f5d66ff0e7934cfd4cc493732..e223c49e8a62a3d6de9aef7ade83881e3c9ae009 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    220,
 /**/
     219,
 /**/