aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.1071: putty-color and cygwin-color are not recognized

Browse Source 
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)
This commit is contained in:
Bram Moolenaar 2017-09-07 22:37:36 +02:00
parent 75a60f74ce
commit c6da01a5b8
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/option.c
View File

@ -4024,8 +4024,8 @@ set_init_2(void)
* This is just guessing! Recognized are: * This is just guessing! Recognized are:
* "linux" Linux console * "linux" Linux console
* "screen.linux" Linux console with screen * "screen.linux" Linux console with screen
* "cygwin" Cygwin shell * "cygwin.*" Cygwin shell
* "putty" Putty program * "putty.*" Putty program
* We also check the COLORFGBG environment variable, which is set by * We also check the COLORFGBG environment variable, which is set by
* rxvt and derivatives. This variable contains either two or three * rxvt and derivatives. This variable contains either two or three
* values separated by semicolons; we want the last value in either * values separated by semicolons; we want the last value in either
@ -4035,15 +4035,15 @@ set_init_2(void)
term_bg_default(void) term_bg_default(void)
{ {
#if defined(WIN3264) #if defined(WIN3264)
/* DOS console nearly always black */ /* DOS console is nearly always black */
return (char_u *)"dark"; return (char_u *)"dark";
#else #else
char_u *p; char_u *p;
if (STRCMP(T_NAME, "linux") == 0 if (STRCMP(T_NAME, "linux") == 0
|| STRCMP(T_NAME, "screen.linux") == 0 || STRCMP(T_NAME, "screen.linux") == 0
|| STRCMP(T_NAME, "cygwin") == 0 || STRNCMP(T_NAME, "cygwin", 6) == 0
|| STRCMP(T_NAME, "putty") == 0 || STRNCMP(T_NAME, "putty", 5) == 0
|| ((p = mch_getenv((char_u *)"COLORFGBG")) != NULL || ((p = mch_getenv((char_u *)"COLORFGBG")) != NULL
&& (p = vim_strrchr(p, ';')) != NULL && (p = vim_strrchr(p, ';')) != NULL
&& ((p[1] >= '0' && p[1] <= '6') || p[1] == '8') && ((p[1] >= '0' && p[1] <= '6') || p[1] == '8')

2
src/version.c
View File

@ -769,6 +769,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 */
/**/
1071,
/**/ /**/
1070, 1070,
/**/ /**/