patch 7.4.1800

Problem:    Unnecessary #ifdef.
Solution:   Just use USE_24BIT. (Ken Takata)

diff --git a/src/syntax.c b/src/syntax.c
index 7d4e7b1e2f93f10f76aca0e30156c86775361508..4e35a6c597a8019a64f994cd57322142f65e48e2 100644 (file)
--- 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 5a094475dd3cf6fc7ecfc64972a4fb07a3492296..e49c125ea21ba757595b87f469dddd101c2237c3 100644 (file)
--- 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,
 /**/