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
index 811af138cd33c2f8b3158cf9e9f4c71fb1b9bbc8..02840de743e1139678e1e93776599086e48c4a22 100644 (file)
--- 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
index e14c2fe03466413d233c1ef89b095bdff902502c..552de7778ddec05e906253ce59f4eae8fb390f8e 100644 (file)
--- 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 */
+/**/
+    1251,
 /**/
     1250,
 /**/