# HG changeset patch # User Christian Brabandt # Date 1461505504 -7200 # Node ID 57b791947796cfb827365fad48a243c101ffde99 # Parent a34f71d119bfbe42fb8a15e5166746cc0397bd24 commit https://github.com/vim/vim/commit/d10abe52019d10403eb559ea0a424bbd310b738f Author: Bram Moolenaar Date: Sun Apr 24 15:41:33 2016 +0200 patch 7.4.1786 Problem: Compiled-in colors do not match rgb.txt. Solution: Use the rgb.txt colors. (Kazunobu Kuriyama) diff --git a/src/term.c b/src/term.c --- a/src/term.c +++ b/src/term.c @@ -1274,18 +1274,18 @@ struct rgbcolor_table_S { static struct rgbcolor_table_S rgb_table[] = { {(char_u *)"black", RGB(0x00, 0x00, 0x00)}, - {(char_u *)"blue", RGB(0x00, 0x00, 0xD4)}, - {(char_u *)"brown", RGB(0x80, 0x40, 0x40)}, - {(char_u *)"cyan", RGB(0x02, 0xAB, 0xEA)}, - {(char_u *)"darkblue", RGB(0x00, 0x00, 0x80)}, - {(char_u *)"darkcyan", RGB(0x00, 0x80, 0x80)}, - {(char_u *)"darkgray", RGB(0x80, 0x80, 0x80)}, - {(char_u *)"darkgreen", RGB(0x00, 0x80, 0x00)}, - {(char_u *)"darkgrey", RGB(0x80, 0x80, 0x80)}, - {(char_u *)"darkmagenta", RGB(0x80, 0x00, 0x80)}, - {(char_u *)"darkred", RGB(0x80, 0x00, 0x00)}, - {(char_u *)"darkyellow", RGB(0xBB, 0xBB, 0x00)}, - {(char_u *)"gray", RGB(0xC0, 0xC0, 0xC0)}, + {(char_u *)"blue", RGB(0x00, 0x00, 0xFF)}, + {(char_u *)"brown", RGB(0xA5, 0x2A, 0x2A)}, + {(char_u *)"cyan", RGB(0x00, 0xFF, 0xFF)}, + {(char_u *)"darkblue", RGB(0x00, 0x00, 0x8B)}, + {(char_u *)"darkcyan", RGB(0x00, 0x8B, 0x8B)}, + {(char_u *)"darkgray", RGB(0xA9, 0xA9, 0xA9)}, + {(char_u *)"darkgreen", RGB(0x00, 0x64, 0x00)}, + {(char_u *)"darkgrey", RGB(0xA9, 0xA9, 0xA9)}, + {(char_u *)"darkmagenta", RGB(0x8B, 0x00, 0x8B)}, + {(char_u *)"darkred", RGB(0x8B, 0x00, 0x00)}, + {(char_u *)"darkyellow", RGB(0x8B, 0x8B, 0x00)}, /* No X11 */ + {(char_u *)"gray", RGB(0xBE, 0xBE, 0xBE)}, {(char_u *)"gray10", RGB(0x1A, 0x1A, 0x1A)}, {(char_u *)"gray20", RGB(0x33, 0x33, 0x33)}, {(char_u *)"gray30", RGB(0x4D, 0x4D, 0x4D)}, @@ -1295,8 +1295,8 @@ static struct rgbcolor_table_S rgb_table {(char_u *)"gray70", RGB(0xB3, 0xB3, 0xB3)}, {(char_u *)"gray80", RGB(0xCC, 0xCC, 0xCC)}, {(char_u *)"gray90", RGB(0xE5, 0xE5, 0xE5)}, - {(char_u *)"green", RGB(0x00, 0x64, 0x11)}, - {(char_u *)"grey", RGB(0xC0, 0xC0, 0xC0)}, + {(char_u *)"green", RGB(0x00, 0xFF, 0x00)}, + {(char_u *)"grey", RGB(0xBE, 0xBE, 0xBE)}, {(char_u *)"grey10", RGB(0x1A, 0x1A, 0x1A)}, {(char_u *)"grey20", RGB(0x33, 0x33, 0x33)}, {(char_u *)"grey30", RGB(0x4D, 0x4D, 0x4D)}, @@ -1306,23 +1306,23 @@ static struct rgbcolor_table_S rgb_table {(char_u *)"grey70", RGB(0xB3, 0xB3, 0xB3)}, {(char_u *)"grey80", RGB(0xCC, 0xCC, 0xCC)}, {(char_u *)"grey90", RGB(0xE5, 0xE5, 0xE5)}, - {(char_u *)"lightblue", RGB(0xA0, 0xA0, 0xFF)}, - {(char_u *)"lightcyan", RGB(0xA0, 0xFF, 0xFF)}, - {(char_u *)"lightgray", RGB(0xE0, 0xE0, 0xE0)}, - {(char_u *)"lightgreen", RGB(0xA0, 0xFF, 0xA0)}, - {(char_u *)"lightgrey", RGB(0xE0, 0xE0, 0xE0)}, - {(char_u *)"lightmagenta",RGB(0xF0, 0xA0, 0xF0)}, - {(char_u *)"lightred", RGB(0xFF, 0xA0, 0xA0)}, - {(char_u *)"lightyellow", RGB(0xFF, 0xFF, 0xA0)}, - {(char_u *)"magenta", RGB(0xF2, 0x08, 0x84)}, - {(char_u *)"orange", RGB(0xFC, 0x80, 0x00)}, + {(char_u *)"lightblue", RGB(0xAD, 0xD8, 0xE6)}, + {(char_u *)"lightcyan", RGB(0xE0, 0xFF, 0xFF)}, + {(char_u *)"lightgray", RGB(0xD3, 0xD3, 0xD3)}, + {(char_u *)"lightgreen", RGB(0x90, 0xEE, 0x90)}, + {(char_u *)"lightgrey", RGB(0xD3, 0xD3, 0xD3)}, + {(char_u *)"lightmagenta", RGB(0xFF, 0x8B, 0xFF)}, /* No X11 */ + {(char_u *)"lightred", RGB(0xFF, 0x8B, 0x8B)}, /* No X11 */ + {(char_u *)"lightyellow", RGB(0xFF, 0xFF, 0xE0)}, + {(char_u *)"magenta", RGB(0xFF, 0x00, 0xFF)}, + {(char_u *)"orange", RGB(0xFF, 0xA5, 0x00)}, {(char_u *)"purple", RGB(0xA0, 0x20, 0xF0)}, - {(char_u *)"red", RGB(0xDD, 0x08, 0x06)}, + {(char_u *)"red", RGB(0xFF, 0x00, 0x00)}, {(char_u *)"seagreen", RGB(0x2E, 0x8B, 0x57)}, {(char_u *)"slateblue", RGB(0x6A, 0x5A, 0xCD)}, - {(char_u *)"violet", RGB(0x8D, 0x38, 0xC9)}, + {(char_u *)"violet", RGB(0xEE, 0x82, 0xEE)}, {(char_u *)"white", RGB(0xFF, 0xFF, 0xFF)}, - {(char_u *)"yellow", RGB(0xFC, 0xF3, 0x05)}, + {(char_u *)"yellow", RGB(0xFF, 0xFF, 0x00)}, }; static int diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1786, +/**/ 1785, /**/ 1784,