From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 25 May 2019 21:42:13 +0000 (+0200)
Subject: patch 8.1.1397: build fails in tiny version
X-Git-Tag: v8.1.1397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80f95425cf98725004b5e8e723ca63f05d3723fa;p=thirdparty%2Fvim.git

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 23ccaf3a38..7c829a8d29 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 65a7b96f41..0e7f14d6cc 100644
--- 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,
 /**/