Mercurial > vim

changeset 12537:a24356fd94d8 v8.0.1147

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1147: fail to build with tiny features commit https://github.com/vim/vim/commit/7c456a4511dff70bb2fc23ebc3dc3d9201dbaacb Author: Bram Moolenaar <Bram@vim.org> Date: Tue Sep 26 11:15:53 2017 +0200 patch 8.0.1147: fail to build with tiny features Problem: Fail to build with tiny features. (Tony Mechelynck) Solution: Move #ifdefs.
author Christian Brabandt <cb@256bit.org>
date Tue, 26 Sep 2017 11:30:04 +0200
parents 1534d85ded5f
children 12021532ed34
files src/syntax.c src/version.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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,