# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1558820704 -7200
# Node ID cd130016c4093f10d759b79724af09773b41fb89
# Parent  91f56a2c97751a47f99ffbe33b132952058e7ab7
patch 8.1.1397: build fails in tiny version

commit https://github.com/vim/vim/commit/80f95425cf98725004b5e8e723ca63f05d3723fa
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat May 25 23:42:13 2019 +0200

    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
--- 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_
     }
     return get_attr_entry(&term_attr_table, &new_en);
 }
-#endif
 
 #ifdef FEAT_GUI
 
diff --git a/src/version.c b/src/version.c
--- 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,