1
0
forked from aniani/vim

updated for version 7.1-009

This commit is contained in:
Bram Moolenaar 2007-06-19 15:44:58 +00:00
parent 884aa898d4
commit 4b80a5179a
2 changed files with 6 additions and 2 deletions

View File

@ -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);
}

View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
9,
/**/
8,
/**/