To: vim_dev@googlegroups.com Subject: Patch 8.2.0656 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0656 Problem: MS-Windows: redrawing right screen edge may not be needed. Solution: Check the build version. (Nobuhiro Takasaki, closes #6002) Files: src/drawscreen.c, src/os_win32.c, src/proto/os_win32.pro *** ../vim-8.2.0655/src/drawscreen.c 2020-04-06 22:12:57.137652853 +0200 --- src/drawscreen.c 2020-04-28 20:41:20.348679712 +0200 *************** *** 2439,2445 **** #ifdef FEAT_VTP // Rewrite the character at the end of the screen line. ! if (use_vtp()) { int i; --- 2439,2446 ---- #ifdef FEAT_VTP // Rewrite the character at the end of the screen line. ! // See the version that was fixed. ! if (use_vtp() && get_conpty_fix_type() < 1) { int i; *** ../vim-8.2.0655/src/os_win32.c 2020-04-26 19:00:03.835249027 +0200 --- src/os_win32.c 2020-04-28 20:41:20.352679703 +0200 *************** *** 188,193 **** --- 188,194 ---- 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,7294 **** --- 7290,7301 ---- #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,7339 **** --- 7341,7349 ---- 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,7627 **** --- 7632,7643 ---- 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) *** ../vim-8.2.0655/src/proto/os_win32.pro 2019-12-12 12:55:41.000000000 +0100 --- src/proto/os_win32.pro 2020-04-28 20:41:20.352679703 +0200 *************** *** 79,83 **** --- 79,84 ---- int has_conpty_working(void); int get_conpty_type(void); int is_conpty_stable(void); + int get_conpty_fix_type(void); void resize_console_buf(void); /* vim: set ft=c : */ *** ../vim-8.2.0655/src/version.c 2020-04-28 20:29:04.241851561 +0200 --- src/version.c 2020-04-28 20:42:46.860498873 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 656, /**/ -- If Pacman had affected us as kids we'd be running around in dark rooms, munching pills and listening to repetitive music. -- Marcus Brigstocke /// 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 ///