aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/fold.c3
-rw-r--r--src/nvim/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 654cdf82a8..ab557ecf68 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -241,6 +241,9 @@ hasFoldingWin (
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/nvim/version.c b/src/nvim/version.c
index 9115c6a59f..d292039cc7 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -70,7 +70,7 @@ static int included_patches[] = {
702,
//701,
//700,
- //699,
+ 699,
//698,
//697,
//696,