aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.1397: build fails in tiny version

Browse Source 
Problem:    Build fails in tiny version.
Solution:   Always define hl_combine_attr().
This commit is contained in:
Bram Moolenaar
2019-05-25 23:42:13 +02:00
parent 193ffd1d9f
commit 80f95425cf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/syntax.c
View File

@@ -8964,7 +8964,6 @@ clear_hl_tables(void)
ga_clear(&cterm_attr_table); 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 * Combine special attributes (e.g., for spelling) with other attributes
* (e.g., for syntax highlighting). * (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); return get_attr_entry(&term_attr_table, &new_en);
} }
#endif
#ifdef FEAT_GUI #ifdef FEAT_GUI

2
src/version.c
View File

@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1397,
/**/ /**/
1396, 1396,
/**/ /**/