commit 6a3897232aecd3e8b9e8b23955e55c1993e5baec
author zeertzjq <zeertzjq@outlook.com> Sun Aug 27 19:04:14 2023 +0200
committer Christian Brabandt <cb@256bit.org> Sun Aug 27 19:04:14 2023 +0200
tree 8a24311230d8c60a43290b5bcaed2080ba31af6a
parent 9a6cf34a1ebdd258acbc6f186bffed42cec2c1a0

patch 9.0.1800: Cursor position still wrong with 'showbreak' and virtual text

Problem:  Cursor position still wrong with 'showbreak' and virtual text
          after last character or 'listchars' "eol".
Solution: Remove unnecessary w_wcol adjustment in curs_columns(). Also
          fix first char of virtual text not shown at the start of a screen
          line.

closes: #12478
closes: #12532
closes: #12904

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>

src/drawline.c

diff --git a/src/drawline.c b/src/drawline.c
index 12ac740..5b5fbf2 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -3733,7 +3733,11 @@
 		&& (*ptr != NUL
 		    || lcs_eol_one > 0
 		    || (wlv.n_extra > 0 && (wlv.c_extra != NUL
-						     || *wlv.p_extra != NUL))))
+						     || *wlv.p_extra != NUL))
+#ifdef FEAT_PROP_POPUP
+		    || text_prop_next < text_prop_count
+#endif
+		   ))
 	{
 	    c = wp->w_lcs_chars.ext;
 	    wlv.char_attr = hl_combine_attr(wlv.win_attr, HL_ATTR(HLF_AT));
@@ -4014,6 +4018,7 @@
 #endif
 #ifdef FEAT_PROP_POPUP
 		    || text_prop_above || text_prop_follows
+		    || text_prop_next < text_prop_count
 #endif
 		    || (wp->w_p_list && wp->w_lcs_chars.eol != NUL
 						&& wlv.p_extra != at_end_str)