From d97fbf171ec0e63117813da045d2a1c51a9b6f62 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 2 Nov 2017 19:23:03 +0100 Subject: [PATCH] patch 8.0.1251: invalid expressin passed to WaitFor() Problem: Invalid expressin passed to WaitFor(). Solution: Check if the variable exists. --- src/testdir/test_clientserver.vim | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index 811af138c..02840de74 100644 --- 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'\") - 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 e14c2fe03..552de7778 100644 --- 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, /**/ -- 2.50.1