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 fb662f71bdd5056aae807a32df9363fae1d1fc9c..6b0d5b5838222d82efe80a9a9312b6b74dd784a0 100644 (file)
--- 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 813ff63e0e73377db5b6b236eb0f2c35aff2238a..a4cafbda235929b3e9d9d25177ba944621d6f85b 100644 (file)
--- 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,
 /**/