patch 8.0.1147: fail to build with tiny features

Problem: Fail to build with tiny features. (Tony Mechelynck) Solution: Move #ifdefs.
vim · Sep 26, 2017 · 7c456a4 · 7c456a4
1 parent 452030e
commit 7c456a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/syntax.c b/src/syntax.c
@@ -7969,9 +7969,9 @@ do_highlight(
 	}
 	else if (STRCMP(key, "GUIFG") == 0)
 	{
+#if defined(FEAT_GUI) || defined(FEAT_EVAL)
 	    char_u **namep = &HL_TABLE()[idx].sg_gui_fg_name;
 
-#if defined(FEAT_GUI) || defined(FEAT_EVAL)
 	    if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
 	    {
 		if (!init)
@@ -8019,9 +8019,9 @@ do_highlight(
 	}
 	else if (STRCMP(key, "GUIBG") == 0)
 	{
+#if defined(FEAT_GUI) || defined(FEAT_EVAL)
 	    char_u **namep = &HL_TABLE()[idx].sg_gui_bg_name;
 
-#if defined(FEAT_GUI) || defined(FEAT_EVAL)
 	    if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
 	    {
 		if (!init)
@@ -8069,9 +8069,9 @@ do_highlight(
 	}
 	else if (STRCMP(key, "GUISP") == 0)
 	{
+#if defined(FEAT_GUI) || defined(FEAT_EVAL)
 	    char_u **namep = &HL_TABLE()[idx].sg_gui_sp_name;
 
-#if defined(FEAT_GUI) || defined(FEAT_EVAL)
 	    if (!init || !(HL_TABLE()[idx].sg_set & SG_GUI))
 	    {
 		if (!init)

diff --git a/src/version.c b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1147,
 /**/
     1146,
 /**/