mirror of
https://github.com/vim/vim.git
synced 2025-09-06 21:53:38 -04:00
patch 7.4.1260
Problem: The channel feature doesn't work on Win32 GUI. Solution: Use WSAGetLastError(). (Ken Takata)
This commit is contained in:
parent
3fc3e14282
commit
a8343c1808
@ -954,11 +954,12 @@ channel_clear(int idx)
|
||||
/*
|
||||
* Check for reading from "fd" with "timeout" msec.
|
||||
* Return FAIL when there is nothing to read.
|
||||
* Always returns OK for FEAT_GUI_W32.
|
||||
*/
|
||||
static int
|
||||
channel_wait(int fd, int timeout)
|
||||
{
|
||||
#ifdef HAVE_SELECT
|
||||
#if defined(HAVE_SELECT) && !defined(FEAT_GUI_W32)
|
||||
struct timeval tval;
|
||||
fd_set rfds;
|
||||
int ret;
|
||||
@ -1045,6 +1046,16 @@ channel_read(int idx)
|
||||
if (len < MAXMSGSIZE)
|
||||
break; /* did read everything that's available */
|
||||
}
|
||||
#ifdef FEAT_GUI_W32
|
||||
if (len == SOCKET_ERROR)
|
||||
{
|
||||
/* For Win32 GUI channel_wait() always returns OK and we handle the
|
||||
* situation that there is nothing to read here.
|
||||
* TODO: how about a timeout? */
|
||||
if (WSAGetLastError() == WSAEWOULDBLOCK)
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Reading a socket disconnection (readlen == 0), or a socket error. */
|
||||
if (readlen <= 0)
|
||||
|
@ -6,13 +6,13 @@ if !has('channel')
|
||||
endif
|
||||
|
||||
" This test requires the Python command to run the test server.
|
||||
" This most likely only works on Unix and Windows console.
|
||||
" This most likely only works on Unix and Windows.
|
||||
if has('unix')
|
||||
" We also need the pkill command to make sure the server can be stopped.
|
||||
if !executable('python') || !executable('pkill')
|
||||
finish
|
||||
endif
|
||||
elseif has('win32') && !has('gui_win32')
|
||||
elseif has('win32')
|
||||
" Use Python Launcher for Windows (py.exe).
|
||||
if !executable('py')
|
||||
finish
|
||||
|
@ -742,6 +742,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1260,
|
||||
/**/
|
||||
1259,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user