diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-03-25 22:08:14 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-03-25 22:08:14 -0300 |
| commit | a6e53a3797a93fe060f807fe2e4c6361854b6c97 (patch) | |
| tree | b684785ba9c769491e6ebdac8e21495cf22dbdd3 /src/nvim/syntax.c | |
| parent | d2d99454e63c0e6649fddd52bbd9a10d27c2e347 (diff) | |
| parent | 2aa2513b8e023a0d7bd2071299f0ea59a4d4ce25 (diff) | |
| download | rneovim-a6e53a3797a93fe060f807fe2e4c6361854b6c97.tar.gz rneovim-a6e53a3797a93fe060f807fe2e4c6361854b6c97.tar.bz2 rneovim-a6e53a3797a93fe060f807fe2e4c6361854b6c97.zip | |
Merge PR #2076 'Builtin terminal emulation'
Diffstat (limited to 'src/nvim/syntax.c')
| -rw-r--r-- | src/nvim/syntax.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 0da79cb8ae..20bfbc8db4 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -40,10 +40,12 @@ #include "nvim/option.h" #include "nvim/os_unix.h" #include "nvim/path.h" +#include "nvim/macros.h" #include "nvim/regexp.h" #include "nvim/screen.h" #include "nvim/strings.h" #include "nvim/syntax_defs.h" +#include "nvim/terminal.h" #include "nvim/ui.h" #include "nvim/os/os.h" #include "nvim/os/time.h" @@ -6636,7 +6638,7 @@ static garray_T attr_table = GA_EMPTY_INIT_VALUE; * if the combination is new. * Return 0 for error. */ -static int get_attr_entry(attrentry_T *aep) +int get_attr_entry(attrentry_T *aep) { garray_T *table = &attr_table; attrentry_T *taep; @@ -6723,6 +6725,10 @@ int hl_combine_attr(int char_attr, int prim_attr) return prim_attr; } + if (prim_attr == 0) { + return char_attr; + } + // Find the entry for char_attr char_aep = syn_cterm_attr2entry(char_attr); @@ -7420,7 +7426,6 @@ char_u *get_highlight_name(expand_T *xp, int idx) return HL_TABLE()[idx].sg_name; } -#define RGB(r, g, b) ((r << 16) | (g << 8) | b) color_name_table_T color_name_table[] = { // Color names taken from // http://www.rapidtables.com/web/color/RGB_Color.htm |