Mercurial > vim

comparison src/structs.h @ 15746:c017195b121b v8.1.0880

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0880: MS-Windows: inconsistent selection of winpty/conpty commit https://github.com/vim/vim/commit/c6ddce3f2cf6daa3a545405373b661f8a9bccad9 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Feb 8 12:47:03 2019 +0100 patch 8.1.0880: MS-Windows: inconsistent selection of winpty/conpty Problem: MS-Windows: inconsistent selection of winpty/conpty. Solution: Name option 'termwintype', use ++type argument and "term_pty" for term_start(). (Hirohito Higashi, closes #3915)
author Bram Moolenaar <Bram@vim.org>
date Fri, 08 Feb 2019 13:00:08 +0100
parents a3e2e7948ee4
children a6ca8cf07a98
comparison
equal deleted inserted replaced
15745:655ee4b0a5cc 15746:c017195b121b
280 #ifdef FEAT_TERMINAL 280 #ifdef FEAT_TERMINAL
281 char_u *wo_twk; 281 char_u *wo_twk;
282 # define w_p_twk w_onebuf_opt.wo_twk /* 'termwinkey' */ 282 # define w_p_twk w_onebuf_opt.wo_twk /* 'termwinkey' */
283 char_u *wo_tws; 283 char_u *wo_tws;
284 # define w_p_tws w_onebuf_opt.wo_tws /* 'termwinsize' */ 284 # define w_p_tws w_onebuf_opt.wo_tws /* 'termwinsize' */
285 char_u *wo_tmod;
286 # define w_p_tmod w_onebuf_opt.wo_tmod /* 'termmode' */
287 #endif 285 #endif
288 286
289 #ifdef FEAT_EVAL 287 #ifdef FEAT_EVAL
290 sctx_T wo_script_ctx[WV_COUNT]; /* SCTXs for window-local options */ 288 sctx_T wo_script_ctx[WV_COUNT]; /* SCTXs for window-local options */
291 # define w_p_script_ctx w_onebuf_opt.wo_script_ctx 289 # define w_p_script_ctx w_onebuf_opt.wo_script_ctx
1554 jobstatus_T jv_status; 1552 jobstatus_T jv_status;
1555 char_u *jv_stoponexit; /* allocated */ 1553 char_u *jv_stoponexit; /* allocated */
1556 #ifdef UNIX 1554 #ifdef UNIX
1557 char_u *jv_termsig; /* allocated */ 1555 char_u *jv_termsig; /* allocated */
1558 #endif 1556 #endif
1557 #ifdef WIN3264
1558 char_u *jv_tty_type; // allocated
1559 #endif
1559 int jv_exitval; 1560 int jv_exitval;
1560 char_u *jv_exit_cb; /* allocated */ 1561 char_u *jv_exit_cb; /* allocated */
1561 partial_T *jv_exit_partial; 1562 partial_T *jv_exit_partial;
1562 1563
1563 buf_T *jv_in_buf; /* buffer from "in-name" */ 1564 buf_T *jv_in_buf; /* buffer from "in-name" */
1789 #define JO2_TERM_OPENCMD 0x0800 /* "term_opencmd" */ 1790 #define JO2_TERM_OPENCMD 0x0800 /* "term_opencmd" */
1790 #define JO2_EOF_CHARS 0x1000 /* "eof_chars" */ 1791 #define JO2_EOF_CHARS 0x1000 /* "eof_chars" */
1791 #define JO2_NORESTORE 0x2000 /* "norestore" */ 1792 #define JO2_NORESTORE 0x2000 /* "norestore" */
1792 #define JO2_TERM_KILL 0x4000 /* "term_kill" */ 1793 #define JO2_TERM_KILL 0x4000 /* "term_kill" */
1793 #define JO2_ANSI_COLORS 0x8000 /* "ansi_colors" */ 1794 #define JO2_ANSI_COLORS 0x8000 /* "ansi_colors" */
1794 #define JO2_TERM_MODE 0x10000 /* "term_mode" */ 1795 #define JO2_TTY_TYPE 0x10000 /* "tty_type" */
1795 1796
1796 #define JO_MODE_ALL (JO_MODE + JO_IN_MODE + JO_OUT_MODE + JO_ERR_MODE) 1797 #define JO_MODE_ALL (JO_MODE + JO_IN_MODE + JO_OUT_MODE + JO_ERR_MODE)
1797 #define JO_CB_ALL \ 1798 #define JO_CB_ALL \
1798 (JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK) 1799 (JO_CALLBACK + JO_OUT_CALLBACK + JO_ERR_CALLBACK + JO_CLOSE_CALLBACK)
1799 #define JO_TIMEOUT_ALL (JO_TIMEOUT + JO_OUT_TIMEOUT + JO_ERR_TIMEOUT) 1800 #define JO_TIMEOUT_ALL (JO_TIMEOUT + JO_OUT_TIMEOUT + JO_ERR_TIMEOUT)
1862 char_u *jo_eof_chars; 1863 char_u *jo_eof_chars;
1863 char_u *jo_term_kill; 1864 char_u *jo_term_kill;
1864 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) 1865 # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
1865 long_u jo_ansi_colors[16]; 1866 long_u jo_ansi_colors[16];
1866 # endif 1867 # endif
1867 int jo_term_mode; // first character of "term_mode" 1868 int jo_tty_type; // first character of "tty_type"
1868 #endif 1869 #endif
1869 } jobopt_T; 1870 } jobopt_T;
1870 1871
1871 1872
1872 /* structure used for explicit stack while garbage collecting hash tables */ 1873 /* structure used for explicit stack while garbage collecting hash tables */