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 5b86a29da7723818064c7b1ea1f56b3e63913c62..a9358101813deca74cc3f0e16c4432f3f32677cb 100644 (file)
--- 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 a71784fd215fefff5bdb3f7de8965a7db3af821f..00948fd974e945604090f2e5a4c58873ecc3fa5d 100644 (file)
--- 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,
 /**/