1
0
forked from aniani/vim

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.
This commit is contained in:
Bram Moolenaar
2016-02-13 18:40:30 +01:00
parent f8b7d890f1
commit bfa1ffca8b
3 changed files with 10 additions and 8 deletions

View File

@@ -1783,7 +1783,13 @@ process_message(void)
int channel_idx = channel_fd2idx((sock_T)msg.wParam); int channel_idx = channel_fd2idx((sock_T)msg.wParam);
if (channel_idx >= 0) 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"); channel_read(channel_idx, FALSE, "process_message");
--emsg_off;
}
return; return;
} }
#endif #endif

View File

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

View File

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