From c60e959cba03fae9cff9b2674fab646cc70819fc Mon Sep 17 00:00:00 2001
From: Dominique Pelle <dominique.pelle@gmail.com>
Date: Sat, 3 Jul 2021 21:41:38 +0200
Subject: [PATCH] patch 8.2.3094: Test_popup_atcursor_pos() fails without the
 conceal feature
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:    Test_popup_atcursor_pos() fails without the conceal feature.
Solution:   Add a check for the conceal feature. (Dominique Pellé,
            closes #8505)
---
 src/testdir/test_popupwin.vim | 1 +
 src/version.c                 | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index cdfa3a987b20f..8e02ef1f0338b 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1437,6 +1437,7 @@ endfunc
 
 func Test_popup_atcursor_pos()
   CheckScreendump
+  CheckFeature conceal
 
   let lines =<< trim END
 	call setline(1, repeat([repeat('-', 60)], 15))
diff --git a/src/version.c b/src/version.c
index 3b8a50a701803..79a6a85998129 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3094,
 /**/
     3093,
 /**/