patch 8.2.3094: Test_popup_atcursor_pos() fails without the conceal feature

Problem:    Test_popup_atcursor_pos() fails without the conceal feature.
Solution:   Add a check for the conceal feature. (Dominique Pellé,
            closes #8505)

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index cdfa3a987b20ff65c8dd5ff5779bf7299db1f7dd..8e02ef1f0338bc29cfdbd1a7f9739093082c4287 100644 (file)
--- 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 3b8a50a70180356d24f765ebf7c28d0683f58ef4..79a6a85998129305f4841eb67c9aac1ca3d551b8 100644 (file)
--- 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,
 /**/