|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.318
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.318
|
|
|
d6ba96 |
Problem: Check for whether a highlight group has settings ignores fg and bg
|
|
|
d6ba96 |
color settings.
|
|
|
d6ba96 |
Solution: Also check cterm and GUI color settings. (Christian Brabandt)
|
|
|
d6ba96 |
Files: src/syntax.c
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.317/src/syntax.c 2014-03-23 15:12:29.939264336 +0100
|
|
|
d6ba96 |
--- src/syntax.c 2014-06-12 12:16:13.851530931 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 8043,8050 ****
|
|
|
d6ba96 |
--- 8043,8056 ----
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
return ( HL_TABLE()[idx].sg_term_attr != 0
|
|
|
d6ba96 |
|| HL_TABLE()[idx].sg_cterm_attr != 0
|
|
|
d6ba96 |
+ || HL_TABLE()[idx].sg_cterm_fg != 0
|
|
|
d6ba96 |
+ || HL_TABLE()[idx].sg_cterm_bg != 0
|
|
|
d6ba96 |
#ifdef FEAT_GUI
|
|
|
d6ba96 |
|| HL_TABLE()[idx].sg_gui_attr != 0
|
|
|
d6ba96 |
+ || HL_TABLE()[idx].sg_gui_fg_name != NULL
|
|
|
d6ba96 |
+ || HL_TABLE()[idx].sg_gui_bg_name != NULL
|
|
|
d6ba96 |
+ || HL_TABLE()[idx].sg_gui_sp_name != NULL
|
|
|
d6ba96 |
+ || HL_TABLE()[idx].sg_font_name != NUL
|
|
|
d6ba96 |
#endif
|
|
|
d6ba96 |
|| (check_link && (HL_TABLE()[idx].sg_set & SG_LINK)));
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
*** ../vim-7.4.317/src/version.c 2014-06-12 11:49:42.219470717 +0200
|
|
|
d6ba96 |
--- src/version.c 2014-06-12 12:17:25.607533645 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 736,737 ****
|
|
|
d6ba96 |
--- 736,739 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 318,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
The software said it requires Windows 95 or better, so I installed Linux.
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|