Merge remote-tracking branch 'vim/master'

Author: splhack

src/fold.c

@@ -2755,7 +2755,7 @@ foldUpdateIEMSRecurse(
 	/* End of fold found, update the length when it got shorter. */
 	if (fp->fd_len != flp->lnum - fp->fd_top)
 	{
-	    if (fp->fd_top + fp->fd_len > bot + 1)
+	    if (fp->fd_top + fp->fd_len - 1 > bot)
 	    {
 		/* fold continued below bot */
 		if (getlevel == foldlevelMarker

src/version.c

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