forked from aniani/vim
updated for version 7.1-009
This commit is contained in:
parent
884aa898d4
commit
4b80a5179a
@ -3459,9 +3459,11 @@ win_line(wp, lnum, startrow, endrow, nochange)
|
|||||||
#ifdef FEAT_DIFF
|
#ifdef FEAT_DIFF
|
||||||
if (diff_hlf != (hlf_T)0)
|
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 */
|
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 */
|
diff_hlf = HLF_CHD; /* changed line */
|
||||||
line_attr = hl_attr(diff_hlf);
|
line_attr = hl_attr(diff_hlf);
|
||||||
}
|
}
|
||||||
|
@ -666,6 +666,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
9,
|
||||||
/**/
|
/**/
|
||||||
8,
|
8,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user