mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-10 13:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.318 #968

Browse Source 
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
This commit is contained in:
André Twupack
2014-07-20 13:05:49 +02:00
committed by Justin M. Keyes
parent b6da1ac339
commit 16a04bae0a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/syntax.c
View File

@@ -6687,6 +6687,8 @@ static int hl_has_settings(int idx, int check_link)
{ {
return HL_TABLE()[idx].sg_term_attr != 0 return HL_TABLE()[idx].sg_term_attr != 0
|| HL_TABLE()[idx].sg_cterm_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)); || (check_link && (HL_TABLE()[idx].sg_set & SG_LINK));
} }

2
src/nvim/version.c
View File

@@ -277,7 +277,7 @@ static int included_patches[] = {
//321 NA //321 NA
//320, //320,
//319 NA //319 NA
//318, 318,
//317, //317,
//316 NA //316 NA
315, 315,