summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-30 16:17:33 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-30 16:17:33 +0200
commitd5c2c7763d73b91efd64a49da8221f9955debdd5 (patch)
treed63a60696eab3f4e4bd9b6502a205c6b9d209d42
parent87be9be1db6b6d8fb57ef14e05f23a84e5e8bea0 (diff)
downloadvim-git-d5c2c7763d73b91efd64a49da8221f9955debdd5.tar.gz
patch 8.2.0846: build failure with small featuresv8.2.0846
Problem: Build failure with small features. Solution: Add #ifdef.
-rw-r--r--src/undo.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/undo.c b/src/undo.c
index 259de9ab2..c2fe81946 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -375,6 +375,7 @@ u_save_line(undoline_T *ul, linenr_T lnum)
return ul->ul_line == NULL ? FAIL : OK;
}
+#ifdef FEAT_PROP_POPUP
/*
* return TRUE if line "lnum" has text property "flags".
*/
@@ -395,6 +396,7 @@ has_prop_w_flags(linenr_T lnum, int flags)
}
return FALSE;
}
+#endif
/*
* Common code for various ways to save text before a change.
diff --git a/src/version.c b/src/version.c
index 16dfa277d..0adfc2660 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 846,
+/**/
845,
/**/
844,