diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-25 23:42:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-25 23:42:13 +0200 |
| commit | 80f95425cf98725004b5e8e723ca63f05d3723fa (patch) | |
| tree | 8e61e283af75f55876fd91a1a9dc50113c36ad68 | |
| parent | 193ffd1d9f4f4d5412ce8d7a46bb2f89d47a56da (diff) | |
| download | vim-git-80f95425cf98725004b5e8e723ca63f05d3723fa.tar.gz | |
patch 8.1.1397: build fails in tiny versionv8.1.1397
Problem: Build fails in tiny version.
Solution: Always define hl_combine_attr().
| -rw-r--r-- | src/syntax.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/syntax.c b/src/syntax.c index 23ccaf3a3..7c829a8d2 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -8964,7 +8964,6 @@ clear_hl_tables(void) ga_clear(&cterm_attr_table); } -#if defined(FEAT_SYN_HL) || defined(FEAT_SPELL) || defined(PROTO) /* * Combine special attributes (e.g., for spelling) with other attributes * (e.g., for syntax highlighting). @@ -9111,7 +9110,6 @@ hl_combine_attr(int char_attr, int prim_attr) } return get_attr_entry(&term_attr_table, &new_en); } -#endif #ifdef FEAT_GUI diff --git a/src/version.c b/src/version.c index 65a7b96f4..0e7f14d6c 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1397, +/**/ 1396, /**/ 1395, |