[vim] 98/139: patch 7.4.1781 Problem: synIDattr() does not respect 'guicolors'. Solution: Change the conditition for the mode. (Christian Brabandt)

[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 da5b3dcf06a3af5b398450258be32b0416451a9b
Author: Bram Moolenaar <Bram at vim.org>
Date:   Sat Apr 23 15:19:02 2016 +0200

    patch 7.4.1781
    Problem:    synIDattr() does not respect 'guicolors'.
    Solution:   Change the conditition for the mode. (Christian Brabandt)
---
 src/eval.c    | 4 ++--
 src/version.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/eval.c b/src/eval.c
index a3fe2a2..b3ebbd7 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 4bd5f7e..2ae156c 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,

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