# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1652692505 -7200
# Node ID f13fcdacb57f6f4524e6cf09b27e5ce45bd22a3a
# Parent  f886980f6e2af1ccfa327238608008ca609b2497
patch 8.2.4961: build error with a certain combination of features

Commit: https://github.com/vim/vim/commit/9f28eeb694cec8f5019b8fbde3f92f4a90dc5006
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon May 16 10:04:51 2022 +0100

    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
--- 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
--- 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,