patch 8.1.1397: build fails in tiny version

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

diff --git a/src/syntax.c b/src/syntax.c
index 23ccaf3a38635dd7e9acfa2246c54e37ed4408b4..7c829a8d2992f0eea17b9ca25f8461a953220a53 100644 (file)
--- 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 65a7b96f41cb21bf2effb8e55af7d8f7d0df6cdf..0e7f14d6cc7d929d529b3d84888a6c166c58769d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1397,
 /**/
     1396,
 /**/