diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-30 12:28:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-30 12:28:15 +0200 |
| commit | 631225627d448b591e529a5d3e7ac74ef44b8459 (patch) | |
| tree | 458a20e584768aeb379c79311c2dc6e3e2379ebf | |
| parent | 61be73bb0f965a895bfb064ea3e55476ac175162 (diff) | |
patch 7.4.1800v7.4.1800
Problem: Unnecessary #ifdef.
Solution: Just use USE_24BIT. (Ken Takata)
| -rw-r--r-- | src/syntax.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/syntax.c b/src/syntax.c index 7d4e7b1e2f..4e35a6c597 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 5a094475dd..e49c125ea2 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, |