diff options
| -rw-r--r-- | src/nvim/testdir/test_quotestar.vim | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_quotestar.vim b/src/nvim/testdir/test_quotestar.vim index 5212b9bc62..d0dd04f91d 100644 --- a/src/nvim/testdir/test_quotestar.vim +++ b/src/nvim/testdir/test_quotestar.vim @@ -53,6 +53,10 @@ func Do_test_quotestar_for_x11() 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 @* = '' @@ -78,8 +82,8 @@ func Do_test_quotestar_for_x11() else call remote_send(name, ":gui -f\<CR>") endif - " Wait for the server to be up and answering requests. - call WaitFor('remote_expr("' . name . '", "v:version", "", 1) != ""') + " Wait for the server in the GUI to be up and answering requests. + call WaitFor('remote_expr("' . name . '", "has(\"gui_running\")", "", 1) =~ "1"') call remote_send(name, ":let @* = 'maybe'\<CR>") call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "maybe"') diff --git a/src/nvim/version.c b/src/nvim/version.c index 1267759970..17f89a25d2 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -1139,7 +1139,7 @@ static const int included_patches[] = { // 503, 502, // 501, - // 500, + 500, 499, 498, // 497, |