0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 8.0.1147: fail to build with tiny features

Problem:    Fail to build with tiny features. (Tony Mechelynck)
Solution:   Move #ifdefs.
This commit is contained in:
Bram Moolenaar 2017-09-26 11:15:53 +02:00
parent 452030e530
commit 7c456a4511
2 changed files with 5 additions and 3 deletions

View File

@ -7969,9 +7969,9 @@ do_highlight(
} }
else if (STRCMP(key, "GUIFG") == 0) else if (STRCMP(key, "GUIFG") == 0)
{ {
#if defined(FEAT_GUI) || defined(FEAT_EVAL)
char_u **namep = &HL_TABLE()[idx].sg_gui_fg_name; 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 || !(HL_TABLE()[idx].sg_set & SG_GUI))
{ {
if (!init) if (!init)
@ -8019,9 +8019,9 @@ do_highlight(
} }
else if (STRCMP(key, "GUIBG") == 0) else if (STRCMP(key, "GUIBG") == 0)
{ {
#if defined(FEAT_GUI) || defined(FEAT_EVAL)
char_u **namep = &HL_TABLE()[idx].sg_gui_bg_name; 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 || !(HL_TABLE()[idx].sg_set & SG_GUI))
{ {
if (!init) if (!init)
@ -8069,9 +8069,9 @@ do_highlight(
} }
else if (STRCMP(key, "GUISP") == 0) else if (STRCMP(key, "GUISP") == 0)
{ {
#if defined(FEAT_GUI) || defined(FEAT_EVAL)
char_u **namep = &HL_TABLE()[idx].sg_gui_sp_name; 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 || !(HL_TABLE()[idx].sg_set & SG_GUI))
{ {
if (!init) if (!init)

View File

@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1147,
/**/ /**/
1146, 1146,
/**/ /**/