# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1509647406 -3600
# Node ID 27eee6528b3d43283a9a935c97522022b3fc9fed
# Parent  538e2f4367a95e188db31575e882d3815eac6ff3
patch 8.0.1251: invalid expressin passed to WaitFor()

commit https://github.com/vim/vim/commit/d97fbf171ec0e63117813da045d2a1c51a9b6f62
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Nov 2 19:23:03 2017 +0100

    patch 8.0.1251: invalid expressin passed to WaitFor()

    Problem:    Invalid expressin passed to WaitFor().
    Solution:   Check if the variable exists.

diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -42,7 +42,7 @@ func Test_client_server()
   call remote_foreground(name)
 
   call remote_send(name, ":let testvar = 'yes'\<CR>")
-  call WaitFor('remote_expr("' . name . '", "testvar", "", 1) == "yes"')
+  call WaitFor('remote_expr("' . name . '", "exists(\"testvar\") ? testvar : \"\"", "", 1) == "yes"')
   call assert_equal('yes', remote_expr(name, "testvar", "", 2))
 
   if has('unix') && has('gui') && !has('gui_running')
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 */
 /**/
+    1251,
+/**/
     1250,
 /**/
     1249,