summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-04-23 15:19:02 +0200
committerBram Moolenaar <Bram@vim.org>2016-04-23 15:19:02 +0200
commitda5b3dcf06a3af5b398450258be32b0416451a9b (patch)
tree4f672fdd7cfec18219ad31901b44d89e51c04514
parentdc633cf82758f67f656cda7fa8ccc30414ee53f8 (diff)
downloadvim-git-da5b3dcf06a3af5b398450258be32b0416451a9b.tar.gz
patch 7.4.1781v7.4.1781
Problem: synIDattr() does not respect 'guicolors'. Solution: Change the conditition for the mode. (Christian Brabandt)
-rw-r--r--src/eval.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index a3fe2a277..b3ebbd727 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -20019,8 +20019,8 @@ f_synIDattr(typval_T *argvars UNUSED, typval_T *rettv)
}
else
{
-#ifdef FEAT_GUI
- if (gui.in_use)
+#if defined(FEAT_GUI) || defined(FEAT_TERMTRUECOLOR)
+ if (USE_24BIT)
modec = 'g';
else
#endif
diff --git a/src/version.c b/src/version.c
index 4bd5f7eb8..2ae156cda 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 */
/**/
+ 1781,
+/**/
1780,
/**/
1779,