summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-07-05 22:03:04 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-05 22:03:04 +0200
commit5cb09620c1e0a0178c0dc986230997a8aac0e61a (patch)
tree23c5f0089c959c5416fd474f41155ebd357ef3e0
parent404557e6a60389d09bbf91dd0cf3bae11bd623b9 (diff)
patch 8.2.3112: in rare cases the cursor may be somewhere in a folded linev8.2.3112
Problem: With concealing enabled and indirectly closing a fold the cursor may be somewhere in a folded line when it is not on the first line of the fold. Solution: Check if he cursor is somewhere in the folded text.
-rw-r--r--src/drawscreen.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/drawscreen.c b/src/drawscreen.c
index 5f531f2d00..da0cd13063 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -1382,7 +1382,10 @@ fold_line(
# ifdef FEAT_CONCEAL
// When the line was not folded w_wrow may have been set, recompute it.
- if (wp == curwin && lnum == wp->w_cursor.lnum && conceal_cursor_line(wp))
+ if (wp == curwin
+ && wp->w_cursor.lnum >= lnum
+ && wp->w_cursor.lnum <= lnume
+ && conceal_cursor_line(wp))
curs_columns(TRUE);
# endif
}
diff --git a/src/version.c b/src/version.c
index 0653c2797c..160b85f425 100644
--- 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 */
/**/
+ 3112,
+/**/
3111,
/**/
3110,