diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-05-28 15:53:53 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-05-28 15:53:53 +0200 |
| commit | d80629cef03cd40b0bf06c402dfe0b720b3bf608 (patch) | |
| tree | 42bdc56cd8ce2f8e646af4605668c9e0e7e016d4 | |
| parent | 28ae5773422c2cf61aaf8d9d2b9fae70642d6a33 (diff) | |
| download | vim-git-d80629cef03cd40b0bf06c402dfe0b720b3bf608.tar.gz | |
patch 7.4.1854v7.4.1854
Problem: When setting 'termguicolors' the Ignore highlighting doesn't work.
(Charles Campbell)
Solution: Handle the color names "fg" and "bg" when the GUI isn't running
and no colors are speficied, fall back to black and white.
| -rw-r--r-- | src/syntax.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/syntax.c b/src/syntax.c index e68090db6..0face62b7 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -8486,11 +8486,11 @@ color_name2handle(char_u *name) #ifdef FEAT_GUI return gui.norm_pixel; #endif -#if defined(FEAT_TERMGUICOLORS) && defined(FEAT_GUI) - else -#endif #ifdef FEAT_TERMGUICOLORS + if (cterm_normal_fg_gui_color != (long_u)INVALCOLOR) return cterm_normal_fg_gui_color; + /* Guess that the foreground is black or white. */ + return GUI_GET_COLOR((char_u *)(*p_bg == 'l' ? "black" : "white")); #endif } if (STRICMP(name, "bg") == 0 || STRICMP(name, "background") == 0) @@ -8501,11 +8501,11 @@ color_name2handle(char_u *name) #ifdef FEAT_GUI return gui.back_pixel; #endif -#if defined(FEAT_TERMGUICOLORS) && defined(FEAT_GUI) - else -#endif #ifdef FEAT_TERMGUICOLORS + if (cterm_normal_bg_gui_color != (long_u)INVALCOLOR) return cterm_normal_bg_gui_color; + /* Guess that the background is white or black. */ + return GUI_GET_COLOR((char_u *)(*p_bg == 'l' ? "white" : "black")); #endif } @@ -8595,7 +8595,6 @@ get_attr_entry(garray_T *table, attrentry_T *aep) && aep->ae_u.cterm.bg_rgb == taep->ae_u.cterm.bg_rgb #endif - ))) return i + ATTR_OFF; diff --git a/src/version.c b/src/version.c index 83221e23b..2ec25c0b5 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 */ /**/ + 1854, +/**/ 1853, /**/ 1852, |