patch 8.2.4961: build error with a certain combination of features
Problem: Build error with a certain combination of features.
Solution: Adjust #if. (John Marriott)
diff --git a/src/memline.c b/src/memline.c
index 2cdd227..83344bc 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3361,7 +3361,8 @@
}
-#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 52144c5..b8fb438 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4961,
+/**/
4960,
/**/
4959,