commit 80f95425cf98725004b5e8e723ca63f05d3723fa
author Bram Moolenaar <Bram@vim.org> Sat May 25 23:42:13 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Sat May 25 23:42:13 2019 +0200
tree 8e61e283af75f55876fd91a1a9dc50113c36ad68
parent 193ffd1d9f4f4d5412ce8d7a46bb2f89d47a56da

patch 8.1.1397: build fails in tiny version

Problem:    Build fails in tiny version.
Solution:   Always define hl_combine_attr().

src/syntax.c

diff --git a/src/syntax.c b/src/syntax.c
index 23ccaf3..7c829a8 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -8964,7 +8964,6 @@
     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 @@
     }
     return get_attr_entry(&term_attr_table, &new_en);
 }
-#endif
 
 #ifdef FEAT_GUI
 

src/version.c

diff --git a/src/version.c b/src/version.c
index 65a7b96..0e7f14d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1397,
+/**/
     1396,
 /**/
     1395,