diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-17 17:45:59 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-17 17:45:59 +0100 |
| commit | 4c5bdb99ad632d703e94fffafba11b91861fea48 (patch) | |
| tree | 1c6a122e7a9a2b3b89a65628f5c042210a934d4e | |
| parent | 1c0aa97827f30e3051ee50a0690555c2c23c0ceb (diff) | |
| download | vim-git-8.2.2149.tar.gz | |
patch 8.2.2149: popupwin test for latin1 sometimes failsv8.2.2149
Problem: Popupwin test for latin1 sometimes fails.
Solution: Wait for the script to finish.
| -rw-r--r-- | src/testdir/test_popupwin.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index cf9536f5e..32a1eb7e8 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -3721,11 +3721,14 @@ func Test_popupwin_latin1_encoding() set encoding=latin1 terminal cat Xmultibyte call popup_create(['one', 'two', 'three', 'four'], #{line: 1, col: 10}) + redraw + echo "Done" END call writefile(lines, 'XtestPopupLatin') call writefile([repeat("\u3042 ", 120)], 'Xmultibyte') let buf = RunVimInTerminal('-S XtestPopupLatin', #{rows: 10}) + call WaitForAssert({-> assert_match('Done', term_getline(buf, 10))}) call term_sendkeys(buf, ":q\<CR>") call StopVimInTerminal(buf) diff --git a/src/version.c b/src/version.c index a5c7127dc..95633c8f2 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 */ /**/ + 2149, +/**/ 2148, /**/ 2147, |