commit e3a8bab6304117b5c341171299472e1a00e70c85
author Bram Moolenaar <Bram@vim.org> Thu Jun 12 12:20:54 2014 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Jun 12 12:20:54 2014 +0200
tree 3fea6e0e43aba169a45618b0987d197ccfbf48c3
parent 06e4a6df0a31138b50b81b6931d6f39f207cd456

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)

src/syntax.c

diff --git a/src/syntax.c b/src/syntax.c
index 5b86a29..a935810 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -8043,8 +8043,14 @@
 {
     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)));
 }

src/version.c

diff --git a/src/version.c b/src/version.c
index a71784f..00948fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    318,
+/**/
     317,
 /**/
     316,