diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-07 22:37:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-07 22:37:36 +0200 |
| commit | c6da01a5b8efe9ca4931074c0cf2189d357707a2 (patch) | |
| tree | d4f4307f2d555230b0359a136850acfcb6b4efa2 | |
| parent | 75a60f74ce1000b0ffed2e6a203a05f3cd160c6a (diff) | |
patch 8.0.1071: putty-color and cygwin-color are not recognizedv8.0.1071
Problem: $TERM names starting with "putty" and "cygwin" are likely to have
a dark background, but are not recognized.
Solution: Only check the first few characters of $TERM to match "putty" or
"cygwin". (Christian Brabandt)
| -rw-r--r-- | src/option.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/option.c b/src/option.c index a1304c9447..a0367e73f4 100644 --- a/src/option.c +++ b/src/option.c @@ -4024,8 +4024,8 @@ set_init_2(void) * This is just guessing! Recognized are: * "linux" Linux console * "screen.linux" Linux console with screen - * "cygwin" Cygwin shell - * "putty" Putty program + * "cygwin.*" Cygwin shell + * "putty.*" Putty program * We also check the COLORFGBG environment variable, which is set by * rxvt and derivatives. This variable contains either two or three * values separated by semicolons; we want the last value in either @@ -4035,15 +4035,15 @@ set_init_2(void) term_bg_default(void) { #if defined(WIN3264) - /* DOS console nearly always black */ + /* DOS console is nearly always black */ return (char_u *)"dark"; #else char_u *p; if (STRCMP(T_NAME, "linux") == 0 || STRCMP(T_NAME, "screen.linux") == 0 - || STRCMP(T_NAME, "cygwin") == 0 - || STRCMP(T_NAME, "putty") == 0 + || STRNCMP(T_NAME, "cygwin", 6) == 0 + || STRNCMP(T_NAME, "putty", 5) == 0 || ((p = mch_getenv((char_u *)"COLORFGBG")) != NULL && (p = vim_strrchr(p, ';')) != NULL && ((p[1] >= '0' && p[1] <= '6') || p[1] == '8') diff --git a/src/version.c b/src/version.c index 8750360c99..4d040fb0db 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1071, +/**/ 1070, /**/ 1069, |