Mercurial > vim
changeset 20201:304015471ae9 v8.2.0656
patch 8.2.0656: MS-Windows: redrawing right screen edge may not be needed
Commit: https://github.com/vim/vim/commit/7ed8f59ae09278c666f1b43488351f9450097372
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Apr 28 20:44:42 2020 +0200
patch 8.2.0656: MS-Windows: redrawing right screen edge may not be needed
Problem: MS-Windows: redrawing right screen edge may not be needed.
Solution: Check the build version. (Nobuhiro Takasaki, closes https://github.com/vim/vim/issues/6002)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 28 Apr 2020 20:45:04 +0200 |
| parents | 84fc9bacfd32 |
| children | c798c7387c39 |
| files | src/drawscreen.c src/os_win32.c src/proto/os_win32.pro src/version.c |
| diffstat | 4 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawscreen.c +++ b/src/drawscreen.c @@ -2439,7 +2439,8 @@ win_update(win_T *wp) #ifdef FEAT_VTP // Rewrite the character at the end of the screen line. - if (use_vtp()) + // See the version that was fixed. + if (use_vtp() && get_conpty_fix_type() < 1) { int i;
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -188,6 +188,7 @@ static int win32_set_archive(char_u *nam static int conpty_working = 0; static int conpty_type = 0; static int conpty_stable = 0; +static int conpty_fix_type = 0; static void vtp_flag_init(); #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) @@ -7289,6 +7290,12 @@ mch_setenv(char *var, char *value, int x #define CONPTY_1909_BUILD MAKE_VER(10, 0, 18363) /* + * Stay ahead of the next update, and when it's done, fix this. + * version ? (2020 update, temporarily use the build number of insider preview) + */ +#define CONPTY_NEXT_UPDATE_BUILD MAKE_VER(10, 0, 19587) + +/* * Confirm until this version. Also the logic changes. * insider preview. */ @@ -7334,6 +7341,9 @@ vtp_flag_init(void) conpty_type = 2; if (ver < CONPTY_FIRST_SUPPORT_BUILD) conpty_type = 1; + + if (ver >= CONPTY_NEXT_UPDATE_BUILD) + conpty_fix_type = 1; } #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) || defined(PROTO) @@ -7622,6 +7632,12 @@ is_conpty_stable(void) return conpty_stable; } + int +get_conpty_fix_type(void) +{ + return conpty_fix_type; +} + #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) || defined(PROTO) void resize_console_buf(void)