aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.4.391

Browse Source 
Problem:    No 'cursorline' highlighting when the cursor is on a line with
            diff highlighting. (Benjamin Fritz)
Solution:   Combine the highlight attributes. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2014-08-06 13:20:56 +02:00
parent ece29e8013
commit e0f148270a
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/screen.c
View File

@@ -3702,7 +3702,12 @@ win_line(wp, lnum, startrow, endrow, nochange)
char_attr = 0; /* was: hl_attr(HLF_AT); */ char_attr = 0; /* was: hl_attr(HLF_AT); */
#ifdef FEAT_DIFF #ifdef FEAT_DIFF
if (diff_hlf != (hlf_T)0) if (diff_hlf != (hlf_T)0)
{
char_attr = hl_attr(diff_hlf); char_attr = hl_attr(diff_hlf);
if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
char_attr = hl_combine_attr(char_attr,
hl_attr(HLF_CUL));
}
#endif #endif
p_extra = NULL; p_extra = NULL;
c_extra = ' '; c_extra = ' ';
@@ -3753,7 +3758,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
#ifdef FEAT_SYN_HL #ifdef FEAT_SYN_HL
/* combine 'showbreak' with 'cursorline' */ /* combine 'showbreak' with 'cursorline' */
if (wp->w_p_cul && lnum == wp->w_cursor.lnum) if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
char_attr = hl_combine_attr(char_attr, HLF_CLN); char_attr = hl_combine_attr(char_attr,
hl_attr(HLF_CUL));
#endif #endif
} }
# endif # endif
@@ -3931,6 +3937,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
&& n_extra == 0) && 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);
if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
line_attr = hl_combine_attr(line_attr, hl_attr(HLF_CUL));
} }
#endif #endif
@@ -4729,7 +4737,12 @@ win_line(wp, lnum, startrow, endrow, nochange)
{ {
diff_hlf = HLF_CHD; diff_hlf = HLF_CHD;
if (attr == 0 || char_attr != attr) if (attr == 0 || char_attr != attr)
{
char_attr = hl_attr(diff_hlf); char_attr = hl_attr(diff_hlf);
if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
char_attr = hl_combine_attr(char_attr,
hl_attr(HLF_CUL));
}
} }
# endif # endif
} }
@@ -10174,9 +10187,9 @@ draw_tabline()
break; break;
screen_puts_len(NameBuff, len, 0, col, screen_puts_len(NameBuff, len, 0, col,
#if defined(FEAT_SYN_HL) #if defined(FEAT_SYN_HL)
hl_combine_attr(attr, hl_attr(HLF_T)) hl_combine_attr(attr, hl_attr(HLF_T))
#else #else
attr attr
#endif #endif
); );
col += len; col += len;

2
src/version.c
View File

@@ -734,6 +734,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 */
/**/
391,
/**/ /**/
390, 390,
/**/ /**/