From 234c3fab28c14846b962c90097496b27ee1b4df8 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 12 Feb 2023 14:42:15 +0000
Subject: patch 9.0.1304: "$" for 'list' option displayed in wrong position

Problem:    "$" for 'list' option displayed in wrong position when there are
            text properties.
Solution:   Adjust logic for order of displayed items. (closes #11959)
---
 src/drawline.c | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'src/drawline.c')

diff --git a/src/drawline.c b/src/drawline.c
index 4328c06c53..72dff66c03 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1945,7 +1945,6 @@ win_line(
 		    --bcol;
 # endif
 		int display_text_first = FALSE;
-		int active_before = text_props_active;
 
 		// Add any text property that starts in this column.
 		// With 'nowrap' and not in the first screen line only "below"
@@ -1962,21 +1961,6 @@ win_line(
 						       & TP_FLAG_ALIGN_ABOVE)))
 			      : bcol >= text_props[text_prop_next].tp_col - 1))
 		{
-		    if (text_props[text_prop_next].tp_col == MAXCOL
-			     && *ptr == NUL
-			     && ((wp->w_p_list && lcs_eol_one > 0)
-				 || (ptr == line
-					&& !did_line
-					&& (text_props[text_prop_next].tp_flags
-						       & TP_FLAG_ALIGN_BELOW))))
-		    {
-			// first display the '$' after the line or display an
-			// empty line
-			text_prop_follows = TRUE;
-			if (text_props_active == active_before)
-			    display_text_first = TRUE;
-			break;
-		    }
 		    if (text_props[text_prop_next].tp_col == MAXCOL
 			    || bcol <= text_props[text_prop_next].tp_col - 1
 					   + text_props[text_prop_next].tp_len)
@@ -2028,6 +2012,24 @@ win_line(
 						| TP_FLAG_ALIGN_BELOW)) == 0
 				    && wlv.col >= wp->w_width))
 			{
+			    if (tp->tp_col == MAXCOL
+				     && *ptr == NUL
+				     && ((wp->w_p_list && lcs_eol_one > 0
+					     && (tp->tp_flags
+						   & TP_FLAG_ALIGN_ABOVE) == 0)
+					 || (ptr == line
+						&& !did_line
+						&& (tp->tp_flags
+						      & TP_FLAG_ALIGN_BELOW))))
+			    {
+				// skip this prop, first display the '$' after
+				// the line or display an empty line
+				text_prop_follows = TRUE;
+				if (used_tpi < 0)
+				    display_text_first = TRUE;
+				continue;
+			    }
+
 			    if (pt->pt_hl_id > 0)
 				used_attr = syn_id2attr(pt->pt_hl_id);
 			    text_prop_type = pt;
@@ -2038,6 +2040,7 @@ win_line(
 			    text_prop_flags = pt->pt_flags;
 			    text_prop_id = tp->tp_id;
 			    used_tpi = tpi;
+			    display_text_first = FALSE;
 			}
 		    }
 		    if (text_prop_id < 0 && used_tpi >= 0
@@ -3104,6 +3107,7 @@ win_line(
 		    }
 		}
 		else if (c == NUL
+			&& wlv.n_extra == 0
 			&& (wp->w_p_list
 			    || ((wlv.fromcol >= 0 || fromcol_prev >= 0)
 				&& wlv.tocol > wlv.vcol
-- 
cgit v1.2.3