changeset 29639:0fc188347f8a v9.0.0160

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.
author Bram Moolenaar <Bram@vim.org>
date Sat, 06 Aug 2022 23:30:03 +0200
parents e580b15a240d
children a2ade5af0cc3
files src/drawline.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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,