patch 7.4.699 Problem: E315 when trying to delete a fold. (Yutao Yuan) Solution: Make sure the fold doesn't go beyond the last buffer line. (Christian Brabandt)

brammool · douglaskayama · commit 5027f23a27be · 2015-04-27T09:07:02.000-03:00
diff --git a/src/fold.c b/src/fold.c
@@ -234,6 +234,8 @@ hasFoldingWin(win, lnum, firstp, lastp, cache, infop)
 	return FALSE;
     }
 
+    if (last > win->w_buffer->b_ml.ml_line_count)
+	last = win->w_buffer->b_ml.ml_line_count;
     if (lastp != NULL)
 	*lastp = last;
     if (firstp != NULL)
diff --git a/src/version.c b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    699,
 /**/
     698,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,8 @@ hasFoldingWin(win, lnum, firstp, lastp, cache, infop)`
`234`	`234`	`return FALSE;`
`235`	`235`	`}`
`236`	`236`
	`237`	`+ if (last > win->w_buffer->b_ml.ml_line_count)`
	`238`	`+ last = win->w_buffer->b_ml.ml_line_count;`
`237`	`239`	`if (lastp != NULL)`
`238`	`240`	`*lastp = last;`
`239`	`241`	`if (firstp != NULL)`