Merge remote-tracking branch 'vim/master'

Author: splhack

src/version.c

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

src/window.c

@@ -3811,6 +3811,7 @@ close_tabpage(tabpage_T *tab)
 	for (ptp = first_tabpage; ptp != NULL && ptp->tp_next != tab;
 							    ptp = ptp->tp_next)
 	    ;
+	assert(ptp != NULL);
 	ptp->tp_next = tab->tp_next;
     }