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.318

Browse Source 
Problem:    Check for whether a highlight group has settings ignores fg and bg
            color settings.
Solution:   Also check cterm and GUI color settings. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2014-06-12 12:20:54 +02:00
parent 06e4a6df0a
commit e3a8bab630
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/syntax.c
View File

@@ -8043,8 +8043,14 @@ hl_has_settings(idx, check_link)
{ {
return ( HL_TABLE()[idx].sg_term_attr != 0 return ( HL_TABLE()[idx].sg_term_attr != 0
|| HL_TABLE()[idx].sg_cterm_attr != 0 || HL_TABLE()[idx].sg_cterm_attr != 0
|| HL_TABLE()[idx].sg_cterm_fg != 0
|| HL_TABLE()[idx].sg_cterm_bg != 0
#ifdef FEAT_GUI #ifdef FEAT_GUI
|| HL_TABLE()[idx].sg_gui_attr != 0 || HL_TABLE()[idx].sg_gui_attr != 0
|| HL_TABLE()[idx].sg_gui_fg_name != NULL
|| HL_TABLE()[idx].sg_gui_bg_name != NULL
|| HL_TABLE()[idx].sg_gui_sp_name != NULL
|| HL_TABLE()[idx].sg_font_name != NUL
#endif #endif
|| (check_link && (HL_TABLE()[idx].sg_set & SG_LINK))); || (check_link && (HL_TABLE()[idx].sg_set & SG_LINK)));
} }

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 */
/**/
318,
/**/ /**/
317, 317,
/**/ /**/