summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDominique Pelle <dominique.pelle@gmail.com>2021-07-03 21:41:38 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-03 21:41:38 +0200
commitc60e959cba03fae9cff9b2674fab646cc70819fc (patch)
treeb1ee703157d0e17ea218a0be3dd0e6e43b169bc2 /src
parentfb773a3e0aa9466bb953c29bad0bf4ba34461a40 (diff)
patch 8.2.3094: Test_popup_atcursor_pos() fails without the conceal featurev8.2.3094
Problem: Test_popup_atcursor_pos() fails without the conceal feature. Solution: Add a check for the conceal feature. (Dominique Pellé, closes #8505)
Diffstat (limited to 'src')
-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 cdfa3a987b..8e02ef1f03 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 3b8a50a701..79a6a85998 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,