From 631225627d448b591e529a5d3e7ac74ef44b8459 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 30 Apr 2016 12:28:15 +0200
Subject: [PATCH] patch 7.4.1800 Problem:    Unnecessary #ifdef. Solution:  
 Just use USE_24BIT. (Ken Takata)

---
 src/syntax.c  | 8 +-------
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/syntax.c b/src/syntax.c
index 7d4e7b1e2..4e35a6c59 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -7795,13 +7795,7 @@ do_highlight(
 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
 		/* In GUI guifg colors are only used when recognized */
 		i = color_name2handle(arg);
-		if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0
-#  ifdef FEAT_GUI
-			|| !(USE_24BIT)
-#  else
-			|| !p_tgc
-#  endif
-		   )
+		if (i != INVALCOLOR || STRCMP(arg, "NONE") == 0 || !USE_24BIT)
 		{
 		    HL_TABLE()[idx].sg_gui_fg = i;
 # endif
diff --git a/src/version.c b/src/version.c
index 5a094475d..e49c125ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1800,
 /**/
     1799,
 /**/