To: vim_dev@googlegroups.com Subject: Patch 7.4.1626 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1626 (after 7.4.1624) Problem: Missing changes to structs. Solution: Include the changes. Files: src/structs.h *** ../vim-7.4.1625/src/structs.h 2016-03-20 19:31:28.897299188 +0100 --- src/structs.h 2016-03-20 20:15:22.170325225 +0100 *************** *** 1319,1324 **** --- 1319,1332 ---- MODE_JS } 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 * are polled. */ #define PART_SOCK 0 *************** *** 1351,1356 **** --- 1359,1365 ---- #endif ch_mode_T ch_mode; + job_io_T ch_io; int ch_timeout; /* request timeout in msec */ readq_T ch_head; /* header for circular raw read queue */ *************** *** 1384,1389 **** --- 1393,1401 ---- 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 * giving pages full of error messages when * the other side has exited, only mention the *************** *** 1443,1456 **** (JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK) #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. */ --- 1455,1460 ---- *** ../vim-7.4.1625/src/version.c 2016-03-20 21:01:55.241112336 +0100 --- src/version.c 2016-03-20 21:16:34.355822779 +0100 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1626, /**/ -- From "know your smileys": @:-() Elvis Presley /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///