# HG changeset patch # User Bram Moolenaar # Date 1568748605 -7200 # Node ID 6a6c4536ea4c2d596a66e8db02459ed1c7f77fb3 # Parent 90a22a3766cdcdd36a05241db9baf2a2ad1af431 patch 8.1.2050: popup window test fails in some configurations Commit: https://github.com/vim/vim/commit/7e0f462db594e3e2eee3a55531250a6afc9c0b92 Author: Bram Moolenaar Date: Tue Sep 17 21:23:39 2019 +0200 patch 8.1.2050: popup window test fails in some configurations Problem: Popup window test fails in some configurations. (James McCoy) Solution: Clear the command line. diff --git a/src/testdir/dumps/Test_popupwin_scroll_10.dump b/src/testdir/dumps/Test_popupwin_scroll_10.dump --- 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 --- 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})\") + call term_sendkeys(buf, ":\") call VerifyScreenDump(buf, 'Test_popupwin_scroll_10', {}) " clean up diff --git a/src/version.c b/src/version.c --- 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,