diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-05-16 10:04:51 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-16 10:04:51 +0100 |
| commit | 9f28eeb694cec8f5019b8fbde3f92f4a90dc5006 (patch) | |
| tree | 5260bbfb2f07d1676a4615de27a90805bfc48b55 | |
| parent | 1bdc60eb91b9e6320318d96ea59bd2aad775f408 (diff) | |
patch 8.2.4961: build error with a certain combination of featuresv8.2.4961
Problem: Build error with a certain combination of features.
Solution: Adjust #if. (John Marriott)
| -rw-r--r-- | src/memline.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/memline.c b/src/memline.c index 2cdd2277dc..83344bcda5 100644 --- a/src/memline.c +++ b/src/memline.c @@ -3361,7 +3361,8 @@ ml_append_flags( } -#if defined(FEAT_SPELL) || defined(FEAT_QUICKFIX) || defined(PROTO) +#if defined(FEAT_SPELL) || defined(FEAT_QUICKFIX) || defined(FEAT_PROP_POPUP) \ + || defined(PROTO) /* * Like ml_append() but for an arbitrary buffer. The buffer must already have * a memline. diff --git a/src/version.c b/src/version.c index 52144c56c5..b8fb438fce 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 */ /**/ + 4961, +/**/ 4960, /**/ 4959, |