From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 19 Jun 2007 15:44:58 +0000 (+0000)
Subject: updated for version 7.1-009
X-Git-Tag: v7.1.009
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b80a5179ac63e1db009cca2fb954328751d3cde;p=vim

updated for version 7.1-009
---

diff --git a/src/screen.c b/src/screen.c
index 3e54ba677..5c4fadded 100644
--- 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 5676bcdf8..1744d60eb 100644
--- 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,
 /**/