1
0
forked from aniani/vim

patch 7.4.1319

Problem:    Tests fail on MS-Windows and on Unix with GUI.
Solution:   Fix unregistering.
This commit is contained in:
Bram Moolenaar
2016-02-14 23:02:34 +01:00
parent 7b3ca76a45
commit 16eb4f8800
6 changed files with 81 additions and 73 deletions

View File

@@ -1301,8 +1301,8 @@ typedef enum
MODE_JS
} ch_mode_T;
/* Ordering matters: IN is last, only SOCK/OUT/ERR are polled */
/* Ordering matters, it is used in for loops: IN is last, only SOCK/OUT/ERR
* are polled. */
#define CHAN_SOCK 0
#define CH_SOCK ch_pfd[CHAN_SOCK].ch_fd
@@ -1342,7 +1342,7 @@ struct channel_S {
int ch_id; /* ID of the channel */
chan_fd_T ch_pfd[4]; /* info for socket, in, out and err */
chan_fd_T ch_pfd[4]; /* info for socket, out, err and in */
readq_T ch_head; /* dummy node, header for circular queue */
@@ -1351,6 +1351,7 @@ struct channel_S {
* the other side has exited, only mention the
* first error until the connection works
* again. */
void (*ch_close_cb)(void); /* callback for when channel is closed */
int ch_block_id; /* ID that channel_read_json_block() is