From 16a04bae0a91e00d120b6fdd8e24b620b9859c87 Mon Sep 17 00:00:00 2001
From: André Twupack <atwupack@mailbox.org>
Date: Sun, 20 Jul 2014 13:05:49 +0200
Subject: vim-patch:7.4.318 #968

Problem:    Check for whether a highlight group has settings ignores fg and bg color settings.
Solution:   Also check cterm and GUI color settings. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=5c47dacf397c1c65d2dfc237b3ff395c66ec3d4d
---
 src/nvim/syntax.c  | 2 ++
 src/nvim/version.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 5b9deb184a..5f6e09925e 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -6687,6 +6687,8 @@ static int hl_has_settings(int idx, int check_link)
 {
   return HL_TABLE()[idx].sg_term_attr != 0
          || HL_TABLE()[idx].sg_cterm_attr != 0
+         || HL_TABLE()[idx].sg_cterm_fg != 0
+         || HL_TABLE()[idx].sg_cterm_bg != 0
          || (check_link && (HL_TABLE()[idx].sg_set & SG_LINK));
 }
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d89486ef7b..a92a5e9f82 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -277,7 +277,7 @@ static int included_patches[] = {
   //321 NA
   //320,
   //319 NA
-  //318,
+  318,
   //317,
   //316 NA
   315,
-- 
cgit