Skip to content

Commit

Permalink
patch 8.0.1071: putty-color and cygwin-color are not recognized
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
brammool committed Sep 7, 2017
1 parent 75a60f7 commit c6da01a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/option.c
Expand Up @@ -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
Expand All @@ -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')
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -769,6 +769,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1071,
/**/
1070,
/**/
Expand Down

0 comments on commit c6da01a

Please sign in to comment.