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
index 79b187ff0e62d2e500b6fb28dac5feb0820b8721..1d262705116a18bd504fc2029db513f39d05bf14 100644 (file)
--- 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 b9755be38f8e7a88e6121e2bb7310fa09c08e3c3..89d71523ada5896ff6603f8776abd05d3834bbcd 100644 (file)
--- 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,
 /**/