From 4d57ba02029071e5947a54766e9f5d42e3bb3008 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 12 Jul 2020 20:00:24 +0200
Subject: [PATCH] patch 8.2.1195: clientserver test fails on MS-Windows

Problem:    Clientserver test fails on MS-Windows.
Solution:   Expect a different error message.
---
 src/testdir/test_clientserver.vim | 6 ++++--
 src/version.c                     | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index eb9fcb800e..dbd832eba3 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -166,8 +166,10 @@ 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')", ['E573:.*vim10'])
-  call assert_fails("call server2client('abc', 'xyz')", ['E573:.*abc'])
+  call assert_fails("let x = remote_read('vim10')",
+        \ [has('unix') ? 'E573:.*vim10' : 'E277:.*vim10'])
+  call assert_fails("call server2client('abc', 'xyz')",
+        \ [has('unix') ? 'E573:.*abc' : 'E258:.*abc'])
 endfunc
 
 " Uncomment this line to get a debugging log
diff --git a/src/version.c b/src/version.c
index 68c6db4d5c..b7555b7236 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1195,
 /**/
     1194,
 /**/
-- 
GitLab