patch 8.0.1147: fail to build with tiny features

Problem:    Fail to build with tiny features. (Tony Mechelynck)
Solution:   Move #ifdefs.

diff --git a/src/syntax.c b/src/syntax.c
index 4e4548d17ed8c84698d20b0a365bf5e3726c449b..fedce8d6150a2804a83d32eb486493327a5c083e 100644 (file)
--- 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
index 18e4a86cb3c14ba10b2ff5716eb1e7f8a4062647..1880b3459d64ad34ab37042577250cd43b796fd5 100644 (file)
--- 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,
 /**/