thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0656: MS-Windows: redrawing right screen edge may not be needed

Browse Source 
Problem:    MS-Windows: redrawing right screen edge may not be needed.
Solution:   Check the build version. (Nobuhiro Takasaki, closes #6002)
This commit is contained in:
Bram Moolenaar
2020-04-28 20:44:42 +02:00
parent 224a5f17c6
commit 7ed8f59ae0
4 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/drawscreen.c
View File

@@ -2439,7 +2439,8 @@ win_update(win_T *wp)
#ifdef FEAT_VTP #ifdef FEAT_VTP
// Rewrite the character at the end of the screen line. // 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; int i;

16
src/os_win32.c
View File

@@ -188,6 +188,7 @@ static int win32_set_archive(char_u *name);
static int conpty_working = 0; static int conpty_working = 0;
static int conpty_type = 0; static int conpty_type = 0;
static int conpty_stable = 0; static int conpty_stable = 0;
static int conpty_fix_type = 0;
static void vtp_flag_init(); static void vtp_flag_init();
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
@@ -7288,6 +7289,12 @@ mch_setenv(char *var, char *value, int x UNUSED)
*/ */
#define CONPTY_1909_BUILD MAKE_VER(10, 0, 18363) #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. * Confirm until this version. Also the logic changes.
* insider preview. * insider preview.
@@ -7334,6 +7341,9 @@ vtp_flag_init(void)
conpty_type = 2; conpty_type = 2;
if (ver < CONPTY_FIRST_SUPPORT_BUILD) if (ver < CONPTY_FIRST_SUPPORT_BUILD)
conpty_type = 1; conpty_type = 1;
if (ver >= CONPTY_NEXT_UPDATE_BUILD)
conpty_fix_type = 1;
} }
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) || defined(PROTO) #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) || defined(PROTO)
@@ -7622,6 +7632,12 @@ is_conpty_stable(void)
return conpty_stable; return conpty_stable;
} }
int
get_conpty_fix_type(void)
{
return conpty_fix_type;
}
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) || defined(PROTO) #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) || defined(PROTO)
void void
resize_console_buf(void) resize_console_buf(void)

1
src/proto/os_win32.pro
View File

@@ -79,5 +79,6 @@ int has_vtp_working(void);
int has_conpty_working(void); int has_conpty_working(void);
int get_conpty_type(void); int get_conpty_type(void);
int is_conpty_stable(void); int is_conpty_stable(void);
int get_conpty_fix_type(void);
void resize_console_buf(void); void resize_console_buf(void);
/* vim: set ft=c : */ /* vim: set ft=c : */

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
656,
/**/ /**/
655, 655,
/**/ /**/