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)

diff --git a/src/fold.c b/src/fold.c
index 41fcee0fd65c5564bca5190fdbe0883de6d9cafd..671bbf75a14f4bf4738b0b4066b2aea3fb20e86f 100644 (file)
--- 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
index 4a35a90a83d51ecb88a02f6fcb78bd71fe9cc3cb..9d1eb797701e80ff71a54a89e166738afeea4d4a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    699,
 /**/
     698,
 /**/