summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Pelle <dominique.pelle@gmail.com>2021-06-04 21:09:55 +0200
committerBram Moolenaar <Bram@vim.org>2021-06-04 21:09:55 +0200
commit56cddb38790ba535919524d9d2f32dbec9f3f07a (patch)
treee6e34609773296a80b76729da36fcdc44e71cedc
parent5fa9b24440d677c1aa00084d0cf84638b1e1a0d5 (diff)
downloadvim-git-56cddb38790ba535919524d9d2f32dbec9f3f07a.tar.gz
patch 8.2.2937: popup test fails if rightleft feature not enabledv8.2.2937
Problem: Popup test fails if rightleft feature not enabled. Solution: Check that the rightleft feature is available. (Dominique Pellé, closes #8321)
-rw-r--r--src/testdir/test_popup.vim14
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 5 deletions
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index 88aeafda7..1d0a77c17 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -1147,7 +1147,9 @@ endfunc
" Test for the popup menu with the 'rightleft' option set
func Test_pum_rightleft()
+ CheckFeature rightleft
CheckScreendump
+
let lines =<< trim END
abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
vim
@@ -1204,11 +1206,13 @@ func Test_pum_scrollbar()
call term_sendkeys(buf, "\<C-E>\<Esc>dd")
call term_wait(buf)
- call term_sendkeys(buf, ":set rightleft\<CR>")
- call term_wait(buf)
- call term_sendkeys(buf, "Go\<C-P>\<C-P>\<C-P>")
- call term_wait(buf)
- call VerifyScreenDump(buf, 'Test_pum_scrollbar_02', {'rows': 7})
+ if has('rightleft')
+ call term_sendkeys(buf, ":set rightleft\<CR>")
+ call term_wait(buf)
+ call term_sendkeys(buf, "Go\<C-P>\<C-P>\<C-P>")
+ call term_wait(buf)
+ call VerifyScreenDump(buf, 'Test_pum_scrollbar_02', {'rows': 7})
+ endif
call StopVimInTerminal(buf)
call delete('Xtest1')
diff --git a/src/version.c b/src/version.c
index a230c4eb0..d59df5c3c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2937,
+/**/
2936,
/**/
2935,