From 89c394faca40d2f5d57705432a433173b295bf73 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 31 Oct 2017 22:19:58 +0100
Subject: [PATCH] patch 8.0.1241: popup test is flaky

Problem:    Popup test is flaky. (James McCoy)
Solution:   Increase the wait time. (Dominique Pelle)
---
 src/testdir/test_popup.vim | 2 +-
 src/version.c              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index 1be4e6fd3..2781aabcd 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -639,7 +639,7 @@ func Test_popup_and_window_resize()
   endif
   let g:buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': h / 3})
   call term_sendkeys(g:buf, (h / 3 - 1)."o\<esc>")
-  call term_wait(g:buf, 200)
+  call term_wait(g:buf, 500)
   call term_sendkeys(g:buf, "Gi\<c-x>")
   call term_sendkeys(g:buf, "\<c-v>")
   call term_wait(g:buf, 100)
diff --git a/src/version.c b/src/version.c
index 339ff1d32..2b5fb2d7b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1241,
 /**/
     1240,
 /**/
-- 
2.50.1