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
index d469fd77739f7a34e177211cbe3289fa0fe80f0c..eec1db6320c649c1999950f0bce7604a96aa9f5e 100644 (file)
--- 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 de8a23f7606d58e58647013fb068e7f9f60f9974..6f7cae6c6751ad001a2c34935a96573ffcdc3e9a 100644 (file)
--- 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 1f120d39803c858f2849aaa695de9863197cf2e6..a2c5ddd5a06605d90b1c8a59749ff3a1bfb095d8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2050,
 /**/
     2049,
 /**/