[vim] 117/139: patch 7.4.1800 Problem: Unnecessary #ifdef. Solution: Just use USE_24BIT. (Ken Takata)

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 631225627d448b591e529a5d3e7ac74ef44b8459
Author: Bram Moolenaar <Bram at vim.org>
Date:   Sat Apr 30 12:28:15 2016 +0200

    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 7d4e7b1..4e35a6c 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 5a09447..e49c125 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1800,
+/**/
     1799,
 /**/
     1798,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git