# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1671290103 -3600
# Node ID edd37b53405ab366d571afdda35ea39f16e3c926
# Parent  ce33ebac9d42089efda2aae33a0cc4a9a8dc1bcb
patch 9.0.1069: diff mode highlight fails for special characters

Commit: https://github.com/vim/vim/commit/417e88bb75ee8af1bf696760bba9f114a007f733
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Dec 17 15:03:02 2022 +0000

    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".

diff --git a/src/drawline.c b/src/drawline.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1069,
+/**/
     1068,
 /**/
     1067,