From 9f28eeb694cec8f5019b8fbde3f92f4a90dc5006 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 16 May 2022 10:04:51 +0100
Subject: [PATCH] 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)
---
 src/memline.c | 3 ++-
 src/version.c | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

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
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4961,
 /**/
     4960,
 /**/