summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-16 18:42:26 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-16 18:42:26 +0200
commita6cc5beb1705359828a45b91402c34640f4e756a (patch)
treed68195e7867f193409b4412460af9f030edfb5fa
parentfafb4b18cd4aa5897537f53003b31bb83d7362df (diff)
downloadvim-git-a6cc5beb1705359828a45b91402c34640f4e756a.tar.gz
patch 8.1.2160: cannot build with +syntax but without +terminalv8.1.2160
Problem: Cannot build with +syntax but without +terminal. Solution: Add #ifdef.
-rw-r--r--src/drawline.c8
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/drawline.c b/src/drawline.c
index d702e9eb8..1415a3177 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1517,8 +1517,12 @@ win_line(
else
#endif
#ifdef FEAT_SYN_HL
- if (has_syntax || get_term_attr)
- char_attr = syntax_attr;
+ if (has_syntax
+# ifdef FEAT_TERMINAL
+ || get_term_attr
+# endif
+ )
+ char_attr = syntax_attr;
else
#endif
char_attr = 0;
diff --git a/src/version.c b/src/version.c
index 91cffb330..9135fe73c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2160,
+/**/
2159,
/**/
2158,