From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 12 Jun 2014 10:20:54 +0000 (+0200)
Subject: updated for version 7.4.318
X-Git-Tag: v7.4.318
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3a8bab6304117b5c341171299472e1a00e70c85;p=vim

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)
---

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
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    318,
 /**/
     317,
 /**/