From ac2d8815ae7a93c54b07cba76475cfb3f26a3ac6 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 31 Aug 2023 18:07:30 +0200 Subject: patch 9.0.1828: cursor wrong with virt text before double-width char Problem: Wrong cursor position with virtual text before double-width char at window edge. Solution: Check for double-width char before adding virtual text size. closes: #12977 Signed-off-by: Christian Brabandt Co-authored-by: zeertzjq --- src/charset.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/charset.c') diff --git a/src/charset.c b/src/charset.c index 3cba7a5e06..3495a0ee17 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1159,6 +1159,9 @@ win_lbr_chartabsize( size = win_chartabsize(wp, s, vcol); if (*s == NUL && !has_lcs_eol) size = 0; // NUL is not displayed +# ifdef FEAT_LINEBREAK + int is_doublewidth = has_mbyte && size == 2 && MB_BYTE2LEN(*s) > 1; +# endif # ifdef FEAT_PROP_POPUP if (cts->cts_has_prop_with_text) @@ -1242,8 +1245,7 @@ win_lbr_chartabsize( # endif # ifdef FEAT_LINEBREAK - if (has_mbyte && size == 2 && MB_BYTE2LEN(*s) > 1 - && wp->w_p_wrap && in_win_border(wp, vcol)) + if (is_doublewidth && wp->w_p_wrap && in_win_border(wp, vcol + size - 2)) { ++size; // Count the ">" in the last column. mb_added = 1; -- cgit v1.2.3