patch 7.4.1330

Problem:    fd_read() has an unused argument.
Solution:   Remove the timeout. (Yasuhiro Matsumoto)

diff --git a/src/channel.c b/src/channel.c
index 003c93336e2794c3641df3a98f4a676d917f74a9..10d94242541aa3aa77127942d3a89a6d03303301 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -47,7 +47,7 @@
 # define sock_write(sd, buf, len) write(sd, buf, len)
 # define sock_read(sd, buf, len) read(sd, buf, len)
 # define sock_close(sd) close(sd)
-# define fd_read(fd, buf, len, timeout) read(fd, buf, len)
+# define fd_read(fd, buf, len) read(fd, buf, len)
 # define fd_write(sd, buf, len) write(sd, buf, len)
 # define fd_close(sd) close(sd)
 #endif
@@ -58,7 +58,7 @@ extern HWND s_hwnd;                   /* Gvim's Window handle */
 
 #ifdef WIN32
     static int
-fd_read(sock_T fd, char_u *buf, size_t len, int timeout)
+fd_read(sock_T fd, char_u *buf, size_t len)
 {
     HANDLE h = (HANDLE)fd;
     DWORD nread;
@@ -1504,7 +1504,7 @@ channel_read(channel_T *channel, int which, char *func)
        if (use_socket)
            len = sock_read(fd, buf, MAXMSGSIZE);
        else
-           len = fd_read(fd, buf, MAXMSGSIZE, channel->ch_timeout);
+           len = fd_read(fd, buf, MAXMSGSIZE);
        if (len <= 0)
            break;      /* error or nothing more to read */
 

diff --git a/src/version.c b/src/version.c
index fc1c8824d90e87a7cdbfb6e23e118e1755063f50..93d381fca54307f819407339e7c4f79bc4153c05 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1330,
 /**/
     1329,
 /**/