# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1509485405 -3600
# Node ID 00baa23b77595bf28751fbf5f339862ef6f99a23
# Parent  f7cfd496a5ffb5ff9da167ff76d347f404aacd69
patch 8.0.1241: popup test is flaky

commit https://github.com/vim/vim/commit/89c394faca40d2f5d57705432a433173b295bf73
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Oct 31 22:19:58 2017 +0100

    patch 8.0.1241: popup test is flaky

    Problem:    Popup test is flaky. (James McCoy)
    Solution:   Increase the wait time. (Dominique Pelle)

diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1241,
+/**/
     1240,
 /**/
     1239,