diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-12 20:49:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-12 20:49:29 +0200 |
| commit | c212dd0a346d57f62013094ea6861eb28e33023c (patch) | |
| tree | 38f65edf4329fa6c831dc26bb8354f8c89db0c3e | |
| parent | 83e7450053399942e1c9efa802c568b51d948541 (diff) | |
| download | vim-git-c212dd0a346d57f62013094ea6861eb28e33023c.tar.gz | |
patch 8.2.1197: clientserver test still fails on MS-Windowsv8.2.1197
Problem: Clientserver test still fails on MS-Windows.
Solution: Expect a different error message.
| -rw-r--r-- | src/testdir/test_clientserver.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index dbd832eba..db63ce3af 100644 --- a/src/testdir/test_clientserver.vim +++ b/src/testdir/test_clientserver.vim @@ -167,9 +167,9 @@ func Test_client_server() call assert_fails('call remote_startserver([])', 'E730:') call assert_fails("let x = remote_peek([])", 'E730:') call assert_fails("let x = remote_read('vim10')", - \ [has('unix') ? 'E573:.*vim10' : 'E277:.*vim10']) + \ has('unix') ? ['E573:.*vim10'] : 'E277:') call assert_fails("call server2client('abc', 'xyz')", - \ [has('unix') ? 'E573:.*abc' : 'E258:.*abc']) + \ has('unix') ? ['E573:.*abc'] : 'E258:') endfunc " Uncomment this line to get a debugging log diff --git a/src/version.c b/src/version.c index 34acc6b69..19b911e46 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1197, +/**/ 1196, /**/ 1195, |