diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-26 11:15:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-26 11:15:53 +0200 |
| commit | 7c456a4511dff70bb2fc23ebc3dc3d9201dbaacb (patch) | |
| tree | f8385cb165cbe2c6b954b4daa28d75bb455294d4 | |
| parent | 452030e530aad9b08fcfa71737d098b33c752b85 (diff) | |
patch 8.0.1147: fail to build with tiny featuresv8.0.1147
Problem: Fail to build with tiny features. (Tony Mechelynck)
Solution: Move #ifdefs.
| -rw-r--r-- | src/syntax.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/syntax.c b/src/syntax.c index 4e4548d17e..fedce8d615 100644 --- 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 18e4a86cb3..1880b3459d 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1147, +/**/ 1146, /**/ 1145, |