Merge remote-tracking branch 'vim/master'

Author: splhack

src/memline.c

@@ -5029,8 +5029,8 @@ ml_updatechunk(
 	    curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines;
 	}
     }
-    else if (line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines
-		 && curix < buf->b_ml.ml_usedchunks - 1)
+    else if (curix < buf->b_ml.ml_usedchunks - 1
+	      && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines)
     {
 	/* Adjust cached curix & curline */
 	curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines;

src/version.c

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