summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-07-25 18:35:15 +0100
committerBram Moolenaar <Bram@vim.org>2022-07-25 18:35:15 +0100
commitfe3fb6e1e6c90e9bada05518a13a72b3fc2f6a98 (patch)
treeb1ad2bf1a189544579fda002666c785d84f409c6
parent7f9969c559b51446632ac7e8f76cde07e7d0078d (diff)
patch 9.0.0068: build fails with tiny featuresv9.0.0068
Problem: Build fails with tiny features. Solution: Add #ifdef.
-rw-r--r--src/charset.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/charset.c b/src/charset.c
index 2df64c9904..8c6ac1c2f4 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -960,10 +960,12 @@ init_chartabsize_arg(
* Free any allocated item in "cts".
*/
void
-clear_chartabsize_arg(chartabsize_T *cts)
+clear_chartabsize_arg(chartabsize_T *cts UNUSED)
{
+#ifdef FEAT_PROP_POPUP
if (cts->cts_text_prop_count > 0)
vim_free(cts->cts_text_props);
+#endif
}
/*
@@ -1023,7 +1025,9 @@ win_lbr_chartabsize(
int *headp UNUSED)
{
win_T *wp = cts->cts_win;
+#ifdef FEAT_PROP_POPUP
char_u *line = cts->cts_line; // start of the line
+#endif
char_u *s = cts->cts_ptr;
colnr_T vcol = cts->cts_vcol;
#ifdef FEAT_LINEBREAK
diff --git a/src/version.c b/src/version.c
index ff2a8ae48d..04e01007c6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 68,
+/**/
67,
/**/
66,