summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-08 20:43:27 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-08 20:43:27 +0200
commit2147746cf816fad00e301c6638df28a4287c9aae (patch)
tree4f60926fffcf031e15838b3895139757e17d792c
parenta772ec5e91efbd5c4b99bb5cf5704a6c6f0baf3f (diff)
downloadvim-git-2147746cf816fad00e301c6638df28a4287c9aae.tar.gz
patch 7.4.2182v7.4.2182
Problem: Color Grey40 used in startup but not in the short list. Solution: Add Grey40 to the builtin colors.
-rw-r--r--src/term.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/term.c b/src/term.c
index 6af82db0c..344fabc35 100644
--- a/src/term.c
+++ b/src/term.c
@@ -6104,6 +6104,7 @@ gui_get_color_cmn(char_u *name)
{(char_u *)"gray", RGB(0xBE, 0xBE, 0xBE)},
{(char_u *)"green", RGB(0x00, 0xFF, 0x00)},
{(char_u *)"grey", RGB(0xBE, 0xBE, 0xBE)},
+ {(char_u *)"grey40", RGB(0x66, 0x66, 0x66)},
{(char_u *)"grey90", RGB(0xE5, 0xE5, 0xE5)},
{(char_u *)"lightblue", RGB(0xAD, 0xD8, 0xE6)},
{(char_u *)"lightcyan", RGB(0xE0, 0xFF, 0xFF)},
diff --git a/src/version.c b/src/version.c
index 21f693284..6a1c27bdf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2182,
+/**/
2181,
/**/
2180,