Skip to content

Commit bfa1ffc

Browse files
committed
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.
1 parent f8b7d89 commit bfa1ffc

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/gui_w48.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1783,7 +1783,13 @@ process_message(void)
17831783
int channel_idx = channel_fd2idx((sock_T)msg.wParam);
17841784

17851785
if (channel_idx >= 0)
1786+
{
1787+
/* Disable error messages, they can mess up the display and throw
1788+
* an exception. */
1789+
++emsg_off;
17861790
channel_read(channel_idx, FALSE, "process_message");
1791+
--emsg_off;
1792+
}
17871793
return;
17881794
}
17891795
#endif

src/testdir/test_channel.vim

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,7 @@ func s:two_channels(port)
191191
endfunc
192192

193193
func Test_two_channels()
194-
" TODO: make this work again with MS-Windows
195-
if has('unix')
196-
call s:run_server('s:two_channels')
197-
endif
194+
call s:run_server('s:two_channels')
198195
endfunc
199196

200197
" Test that a server crash is handled gracefully.
@@ -211,10 +208,7 @@ func s:server_crash(port)
211208
endfunc
212209

213210
func Test_server_crash()
214-
" TODO: make this work again with MS-Windows
215-
if has('unix')
216-
call s:run_server('s:server_crash')
217-
endif
211+
call s:run_server('s:server_crash')
218212
endfunc
219213

220214
let s:reply = ""

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,8 @@ static char *(features[]) =
747747

748748
static int included_patches[] =
749749
{ /* Add new patch number below this line */
750+
/**/
751+
1313,
750752
/**/
751753
1312,
752754
/**/

0 commit comments

Comments
 (0)