summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-14 22:33:47 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-14 22:33:47 +0200
commit0571f3d6f92a7dab9c1e39acb40c2f8885887b28 (patch)
tree9b8e6bcb949f796afda1e0e2802942c4924f0fab
parent076d98839c4f6f15ae3563263057aa99ff04a869 (diff)
downloadvim-git-0571f3d6f92a7dab9c1e39acb40c2f8885887b28.tar.gz
patch 8.1.2033: cannot build with tiny featuresv8.1.2033
Problem: Cannot build with tiny features. Solution: Add #ifdef.
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c
index fec1081c2..14b946538 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -5383,9 +5383,11 @@ win_line(
&& draw_state == WL_LINE
&& !attr_pri)
{
+#ifdef LINE_ATTR
if (line_attr)
char_attr = hl_combine_attr(extra_attr, line_attr);
else
+#endif
char_attr = extra_attr;
}
diff --git a/src/version.c b/src/version.c
index 0c6b2d8ca..9eb5db723 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2033,
+/**/
2032,
/**/
2031,