summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_popupwin.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index cdfa3a987..8e02ef1f0 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 3b8a50a70..79a6a8599 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3094,
+/**/
3093,
/**/
3092,