mirror of
https://github.com/vim/vim.git
synced 2025-10-02 05:04:20 -04:00
patch 7.4.1626
Problem: Missing changes to structs. Solution: Include the changes.
This commit is contained in:
@@ -1319,6 +1319,14 @@ typedef enum
|
|||||||
MODE_JS
|
MODE_JS
|
||||||
} ch_mode_T;
|
} ch_mode_T;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
JIO_PIPE, /* default */
|
||||||
|
JIO_NULL,
|
||||||
|
JIO_FILE,
|
||||||
|
JIO_BUFFER,
|
||||||
|
JIO_OUT
|
||||||
|
} job_io_T;
|
||||||
|
|
||||||
/* Ordering matters, it is used in for loops: IN is last, only SOCK/OUT/ERR
|
/* Ordering matters, it is used in for loops: IN is last, only SOCK/OUT/ERR
|
||||||
* are polled. */
|
* are polled. */
|
||||||
#define PART_SOCK 0
|
#define PART_SOCK 0
|
||||||
@@ -1351,6 +1359,7 @@ typedef struct {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
ch_mode_T ch_mode;
|
ch_mode_T ch_mode;
|
||||||
|
job_io_T ch_io;
|
||||||
int ch_timeout; /* request timeout in msec */
|
int ch_timeout; /* request timeout in msec */
|
||||||
|
|
||||||
readq_T ch_head; /* header for circular raw read queue */
|
readq_T ch_head; /* header for circular raw read queue */
|
||||||
@@ -1384,6 +1393,9 @@ struct channel_S {
|
|||||||
|
|
||||||
chanpart_T ch_part[4]; /* info for socket, out, err and in */
|
chanpart_T ch_part[4]; /* info for socket, out, err and in */
|
||||||
|
|
||||||
|
char *ch_hostname; /* only for socket, allocated */
|
||||||
|
int ch_port; /* only for socket */
|
||||||
|
|
||||||
int ch_error; /* When TRUE an error was reported. Avoids
|
int ch_error; /* When TRUE an error was reported. Avoids
|
||||||
* giving pages full of error messages when
|
* giving pages full of error messages when
|
||||||
* the other side has exited, only mention the
|
* the other side has exited, only mention the
|
||||||
@@ -1443,14 +1455,6 @@ struct channel_S {
|
|||||||
(JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK)
|
(JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK)
|
||||||
#define JO_TIMEOUT_ALL (JO_TIMEOUT + JO_OUT_TIMEOUT + JO_ERR_TIMEOUT)
|
#define JO_TIMEOUT_ALL (JO_TIMEOUT + JO_OUT_TIMEOUT + JO_ERR_TIMEOUT)
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
JIO_PIPE, /* default */
|
|
||||||
JIO_NULL,
|
|
||||||
JIO_FILE,
|
|
||||||
JIO_BUFFER,
|
|
||||||
JIO_OUT
|
|
||||||
} job_io_T;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Options for job and channel commands.
|
* Options for job and channel commands.
|
||||||
*/
|
*/
|
||||||
|
@@ -748,6 +748,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 */
|
||||||
|
/**/
|
||||||
|
1626,
|
||||||
/**/
|
/**/
|
||||||
1625,
|
1625,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user