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 2cdd2277dcbe48b568ab9bbd9a08df3853c17e61..83344bcda5a1d072b48d0ddde2f0cbc2e731d6c6 100644 (file)
--- 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 52144c56c5e67d065c3d9f7e18d567b234777f8d..b8fb438fce3ed320de1f78bd4959e11fab88e9fe 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4961,
 /**/
     4960,
 /**/