From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 6 Aug 2022 21:23:40 +0000 (+0100)
Subject: patch 9.0.0160: some diff mode tests fail
X-Git-Tag: v9.0.0160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83bf11a1ffc5a7bc4a5ba81747df606d69c1465a;p=thirdparty%2Fvim.git

patch 9.0.0160: some diff mode tests fail

Problem:    Some diff mode tests fail.
Solution:   Only advance "ptr" when a text property follows.
---

diff --git a/src/drawline.c b/src/drawline.c
index fb662f71bd..6b0d5b5838 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -3473,7 +3473,7 @@ win_line(
 		    ) || lcs_eol_one == -1)
 		break;
 #ifdef FEAT_PROP_POPUP
-	    if (!wp->w_p_wrap)
+	    if (!wp->w_p_wrap && text_prop_follows)
 	    {
 		// do not output more of the line, only the "below" prop
 		ptr += STRLEN(ptr);
diff --git a/src/version.c b/src/version.c
index 813ff63e0e..a4cafbda23 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    160,
 /**/
     159,
 /**/