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.
diff --git a/src/gui_w48.c b/src/gui_w48.c
index f2265ff..fd65581 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -1783,7 +1783,13 @@
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
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 7b66099..f0a149d 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -191,10 +191,7 @@
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 @@
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 = ""
diff --git a/src/version.c b/src/version.c
index b934ea2..f5f8f56 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1313,
+/**/
1312,
/**/
1311,
