diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-06-12 12:20:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-06-12 12:20:54 +0200 |
| commit | e3a8bab6304117b5c341171299472e1a00e70c85 (patch) | |
| tree | 3fea6e0e43aba169a45618b0987d197ccfbf48c3 /src | |
| parent | 06e4a6df0a31138b50b81b6931d6f39f207cd456 (diff) | |
| download | vim-e3a8bab6304117b5c341171299472e1a00e70c85.zip | |
updated for version 7.4.318
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/syntax.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/syntax.c b/src/syntax.c index 5b86a29da..a93581018 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -8043,8 +8043,14 @@ hl_has_settings(idx, check_link) { return ( HL_TABLE()[idx].sg_term_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 || 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 || (check_link && (HL_TABLE()[idx].sg_set & SG_LINK))); } diff --git a/src/version.c b/src/version.c index a71784fd2..00948fd97 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 318, +/**/ 317, /**/ 316, |