From 417e88bb75ee8af1bf696760bba9f114a007f733 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 17 Dec 2022 15:03:02 +0000
Subject: [PATCH] patch 9.0.1069: diff mode highlight fails for special
 characters

Problem:    Diff mode highlight fails for special characters.
Solution:   Adjust condition for setting "diff_hlf".
---
 src/drawline.c | 5 +++--
 src/version.c  | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/drawline.c b/src/drawline.c
index 79b187ff0e..1d26270511 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -2211,8 +2211,9 @@ win_line(
 		if (wlv.diff_hlf == HLF_CHD && ptr - line >= change_start
 							   && wlv.n_extra == 0)
 		    wlv.diff_hlf = HLF_TXD;		// changed text
-		if (wlv.diff_hlf == HLF_TXD && (ptr - line > change_end
-							   || wlv.n_extra > 0))
+		if (wlv.diff_hlf == HLF_TXD
+			&& ((ptr - line > change_end && wlv.n_extra == 0)
+			       || (wlv.n_extra > 0 && wlv.extra_for_textprop)))
 		    wlv.diff_hlf = HLF_CHD;		// changed line
 		wlv.line_attr = HL_ATTR(wlv.diff_hlf);
 		if (wp->w_p_cul && lnum == wp->w_cursor.lnum
diff --git a/src/version.c b/src/version.c
index b9755be38f..89d71523ad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1069,
 /**/
     1068,
 /**/