Merge remote-tracking branch 'vim/master'

Author: splhack

src/channel.c

@@ -1559,7 +1559,7 @@ channel_send(int ch_idx, char_u *buf, char *fun)
     channel_T	*channel = &channels[ch_idx];
     int		len = (int)STRLEN(buf);
     int		res;
-    int		fd;
+    int		fd = -1;
     int		use_socket = FALSE;
 
     if (channel->ch_sock >= 0)

src/gui_w48.c

@@ -1783,7 +1783,13 @@ process_message(void)
 	int channel_idx = channel_fd2idx((sock_T)msg.wParam);
 
 	if (channel_idx >= 0)
+	{
+	    /* Disable error messages, they can mess up the display and throw
+	     * an exception. */
+	    ++emsg_off;
 	    channel_read(channel_idx, FALSE, "process_message");
+	    --emsg_off;
+	}
 	return;
     }
 #endif

src/testdir/test_channel.vim

@@ -191,10 +191,7 @@ func s:two_channels(port)
 endfunc
 
 func Test_two_channels()
-  " TODO: make this work again with MS-Windows
-  if has('unix')
-    call s:run_server('s:two_channels')
-  endif
+  call s:run_server('s:two_channels')
 endfunc
 
 " Test that a server crash is handled gracefully.
@@ -211,10 +208,7 @@ func s:server_crash(port)
 endfunc
 
 func Test_server_crash()
-  " TODO: make this work again with MS-Windows
-  if has('unix')
-    call s:run_server('s:server_crash')
-  endif
+  call s:run_server('s:server_crash')
 endfunc
 
 let s:reply = ""

src/version.c

@@ -762,6 +762,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1314,
+/**/
+    1313,
 /**/
     1312,
 /**/