Mercurial > vim

changeset 16790:cd130016c409 v8.1.1397

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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().
author Bram Moolenaar <Bram@vim.org>
date Sat, 25 May 2019 23:45:04 +0200
parents 91f56a2c9775
children bf8ec0c97607
files src/syntax.c src/version.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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,