# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1659821403 -7200
# Node ID 0fc188347f8a7038992409e9b053e8df1f5f961f
# Parent  e580b15a240d5ac88203dd01b87cf86f51b56734
patch 9.0.0160: some diff mode tests fail

Commit: https://github.com/vim/vim/commit/83bf11a1ffc5a7bc4a5ba81747df606d69c1465a
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Aug 6 22:23:40 2022 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    160,
+/**/
     159,
 /**/
     158,