summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-06-09 12:33:40 +0200
committerBram Moolenaar <Bram@vim.org>2021-06-09 12:33:40 +0200
commite3f50ad640fb30f27027f85a616280288bbc14ca (patch)
tree3d1b304e80f195a1a17ba35584d9aee6d247e61b
parentb55d618f193d9f413612d8d4e62758056e842e46 (diff)
downloadvim-git-e3f50ad640fb30f27027f85a616280288bbc14ca.tar.gz
patch 8.2.2966: ml_get errors after recovering a filev8.2.2966
Problem: ml_get errors after recovering a file. (Yegappan Lakshmanan) Solution: Fix the cursor position after deleting lines.
-rw-r--r--src/memline.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/memline.c b/src/memline.c
index a0b642908..58582c9d6 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -1696,6 +1696,7 @@ ml_recover(int checkext)
&& !(curbuf->b_ml.ml_flags & ML_EMPTY))
ml_delete(curbuf->b_ml.ml_line_count);
curbuf->b_flags |= BF_RECOVERED;
+ check_cursor();
recoverymode = FALSE;
if (got_int)
diff --git a/src/version.c b/src/version.c
index aee9dcff2..f57d69267 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2966,
+/**/
2965,
/**/
2964,