updated for version 7.1-009

diff --git a/src/screen.c b/src/screen.c
index 3e54ba6777d1f9067e17ba98745011d9a57aafe9..5c4faddedb06266250c1b66f58bd4c7f78e7c7d6 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -3459,9 +3459,11 @@ win_line(wp, lnum, startrow, endrow, nochange)
 #ifdef FEAT_DIFF
            if (diff_hlf != (hlf_T)0)
            {
-               if (diff_hlf == HLF_CHD && ptr - line >= change_start)
+               if (diff_hlf == HLF_CHD && ptr - line >= change_start
+                                                             && n_extra == 0)
                    diff_hlf = HLF_TXD;         /* changed text */
-               if (diff_hlf == HLF_TXD && ptr - line > change_end)
+               if (diff_hlf == HLF_TXD && ptr - line > change_end
+                                                             && n_extra == 0)
                    diff_hlf = HLF_CHD;         /* changed line */
                line_attr = hl_attr(diff_hlf);
            }

diff --git a/src/version.c b/src/version.c
index 5676bcdf8f9fbcf8d93826a00c27b131ce602cd7..1744d60eb0a7124769cf4bf0ff172bbb15f8f970 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    9,
 /**/
     8,
 /**/