diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-17 21:23:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-17 21:23:39 +0200 |
| commit | 7e0f462db594e3e2eee3a55531250a6afc9c0b92 (patch) | |
| tree | 09d3a85e0b18f36cbc734ea6f040075ebdf341a4 | |
| parent | 397c6a1438186adef54fe5113690307e644b0f42 (diff) | |
patch 8.1.2050: popup window test fails in some configurationsv8.1.2050
Problem: Popup window test fails in some configurations. (James McCoy)
Solution: Clear the command line.
| -rw-r--r-- | src/testdir/dumps/Test_popupwin_scroll_10.dump | 2 | ||||
| -rw-r--r-- | src/testdir/test_popupwin.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/dumps/Test_popupwin_scroll_10.dump b/src/testdir/dumps/Test_popupwin_scroll_10.dump index d469fd7773..eec1db6320 100644 --- a/src/testdir/dumps/Test_popupwin_scroll_10.dump +++ b/src/testdir/dumps/Test_popupwin_scroll_10.dump @@ -7,4 +7,4 @@ |7| @31|║+0#0000001#ffd7ff255|n|i|n|e| | +0#0000000#4040ff13|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@33 |8| @31|╚+0#0000001#ffd7ff255|═@5|╝| +0#0000000#ffffff0@33 |9| @73 -|:|c|a|l@1| |p|o|p|u|p|_|s|e|t|o|p|t|i|o|n|s|(|w|i|n|i|d|,| |#|{|m|a|x|h|e|i|g|h|t|:| |0|,| |m|i|n|w|i|d|t|h|:| |0|1|,|1| @10|T|o|p| +|:| @55|1|,|1| @10|T|o|p| diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index de8a23f760..6f7cae6c67 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -1764,6 +1764,7 @@ func Test_popup_scrollbar() " remove the minwidth and maxheight call term_sendkeys(buf, ":call popup_setoptions(winid, #{maxheight: 0, minwidth: 0})\<CR>") + call term_sendkeys(buf, ":\<CR>") call VerifyScreenDump(buf, 'Test_popupwin_scroll_10', {}) " clean up diff --git a/src/version.c b/src/version.c index 1f120d3980..a2c5ddd5a0 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2050, +/**/ 2049, /**/ 2048, |