From 5cb09620c1e0a0178c0dc986230997a8aac0e61a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 5 Jul 2021 22:03:04 +0200 Subject: [PATCH] patch 8.2.3112: in rare cases the cursor may be somewhere in a folded line 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. --- src/drawscreen.c | 5 ++++- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/drawscreen.c b/src/drawscreen.c index 5f531f2d0..da0cd1306 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 0653c2797..160b85f42 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3112, /**/ 3111, /**/