# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1455624904 -3600
# Node ID 38887bf423ba5fe29389d64f78f6aeb1d609a032
# Parent  a4cd495eb365876a19cbb6555f1eb9b1ac767db2
commit https://github.com/vim/vim/commit/0943a09db84b036ec550d7f2e5b832f621b400ca
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Feb 16 13:11:17 2016 +0100

    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
--- 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 h
 
 #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 whi
 	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
--- 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 */
 /**/
+    1330,
+/**/
     1329,
 /**/
     1328,