changeset 8037:9dea1571b352 v7.4.1313

commit https://github.com/vim/vim/commit/bfa1ffca8bcce92c030d8366036a316954f1ee69 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 13 18:40:30 2016 +0100 patch 7.4.1313 Problem: MS-Windows: Using socket after it was closed causes an exception. Solution: Don't give an error when handling WM_NETBEANS. Re-enable tests for MS-Windows.
author Christian Brabandt <cb@256bit.org>
date Sat, 13 Feb 2016 18:45:04 +0100
parents 72d658f0f095
children 14937a52f35f
files src/gui_w48.c src/testdir/test_channel.vim src/version.c
diffstat 3 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui_w48.c
+++ b/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
--- a/src/testdir/test_channel.vim
+++ b/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 = ""
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1313,
+/**/
     1312,
 /**/
     1311,