diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-13 18:40:30 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-13 18:40:30 +0100 |
| commit | bfa1ffca8bcce92c030d8366036a316954f1ee69 (patch) | |
| tree | 2620fcb4775ad57af7916120fd548b8db4969471 | |
| parent | f8b7d890f1d62f3ab101d2b02dd7716cb7f053cb (diff) | |
patch 7.4.1313v7.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.
| -rw-r--r-- | src/gui_w48.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_channel.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/gui_w48.c b/src/gui_w48.c index f2265ffb8e..fd65581a0e 100644 --- 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 diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 7b66099e2e..f0a149d190 100644 --- 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 = "" diff --git a/src/version.c b/src/version.c index b934ea284e..f5f8f56d93 100644 --- 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, |