# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1519490704 -3600
# Node ID 283d0ee46f001819b7154b3750e8c04a09879ca0
# Parent  2a19cbcd7214a3ae08f5391b37286c3de8219ad7
patch 8.0.1536: quotestar test is flaky when using the GUI

commit https://github.com/vim/vim/commit/791010e648a68490440e202222938c8a93b9d0d3
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Feb 24 17:42:28 2018 +0100

    patch 8.0.1536: quotestar test is flaky when using the GUI

    Problem:    Quotestar test is flaky when using the GUI.
    Solution:   Add check that the star register arrived at the server.  Increase
                timeouts.

diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -65,24 +65,23 @@ func Do_test_quotestar_for_x11()
 
   " Takes a short while for the server to be active.
   call WaitFor('serverlist() =~ "' . name . '"')
-  call assert_match(name, serverlist())
 
   " Wait for the server to be up and answering requests.  One second is not
   " always sufficient.
   call WaitFor('remote_expr("' . name . '", "v:version", "", 2) != ""')
 
-  " Clear the *-register of this vim instance.
-  let @* = ''
+  " Clear the *-register of this vim instance and wait for it to be picked up
+  " by the server.
+  let @* = 'no'
+  call remote_foreground(name)
+  call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "no"', 3000)
 
-  " Try to change the *-register of the server.
-  call remote_foreground(name)
+  " Set the * register on the server.
   call remote_send(name, ":let @* = 'yes'\<CR>")
-  call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "yes"')
-  call assert_equal('yes', remote_expr(name, "@*", "", 2))
+  call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "yes"', 3000)
 
   " Check that the *-register of this vim instance is changed as expected.
-  call WaitFor('@* == "yes"')
-  call assert_equal('yes', @*)
+  call WaitFor('@* == "yes"', 3000)
 
   " Handle the large selection over 262040 byte.
   let length = 262044
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1536,
+/**/
     1535,
 /**/
     1534,