diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-02-13 19:23:10 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-02-13 19:23:10 +0100 |
commit | d9ef1b8d77f304c83241f807c17ffa26c9033778 (patch) | |
tree | 6ee2529331b75406746e699dc7af020e00ecdf7b /src/os_win32.c | |
parent | 9403a2168db82b7de80f792984084bb3f00e2263 (diff) | |
download | vim-git-d9ef1b8d77f304c83241f807c17ffa26c9033778.tar.gz |
patch 8.1.0909: MS-Windows: using ConPTY even though it is not stablev8.1.0909
Problem: MS-Windows: using ConPTY even though it is not stable.
Solution: When ConPTY version is unstable, prefer using winpty. (Ken Takata,
closes #3949)
Diffstat (limited to 'src/os_win32.c')
-rw-r--r-- | src/os_win32.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 10ca41881..0680346af 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -187,6 +187,8 @@ static int win32_setattrs(char_u *name, int attrs); static int win32_set_archive(char_u *name); static int vtp_working = 0; +static int conpty_working = 0; +static int conpty_stable = 0; static void vtp_flag_init(); #ifndef FEAT_GUI_W32 @@ -7638,9 +7640,10 @@ mch_setenv(char *var, char *value, int x) /* * Support for pseudo-console (ConPTY) was added in windows 10 - * version 1809 (October 2018 update). + * version 1809 (October 2018 update). However, that version is unstable. */ -#define CONPTY_FIRST_SUPPORT_BUILD MAKE_VER(10, 0, 17763) +#define CONPTY_FIRST_SUPPORT_BUILD MAKE_VER(10, 0, 17763) +#define CONPTY_STABLE_BUILD MAKE_VER(10, 0, 32767) // T.B.D. static void vtp_flag_init(void) @@ -7659,10 +7662,10 @@ vtp_flag_init(void) vtp_working = 0; #endif -#ifdef FEAT_GUI_W32 if (ver >= CONPTY_FIRST_SUPPORT_BUILD) - vtp_working = 1; -#endif + conpty_working = 1; + if (ver >= CONPTY_STABLE_BUILD) + conpty_stable = 1; } @@ -7878,3 +7881,15 @@ has_vtp_working(void) { return vtp_working; } + + int +has_conpty_working(void) +{ + return conpty_working; +} + + int +is_conpty_stable(void) +{ + return conpty_stable; +} |