updated for version 7.3.298

Problem:    Built-in colors are different from rgb.txt.
Solution:   Adjust the color values. (Benjamin Haskell)

diff --git a/src/gui_photon.c b/src/gui_photon.c
index 9cb65ba0b700719fb2d3e156efc990fa29e9aeaf..e48a41f5096e641598e7ac681e91c8775eb36211 100644 (file)
--- a/src/gui_photon.c
+++ b/src/gui_photon.c
@@ -2007,8 +2007,8 @@ gui_mch_get_color(char_u *name)
     static GuiColourTable table[] =
     {
        {"Black",           RGB(0x00, 0x00, 0x00)},
-       {"DarkGray",        RGB(0x80, 0x80, 0x80)},
-       {"DarkGrey",        RGB(0x80, 0x80, 0x80)},
+       {"DarkGray",        RGB(0xA9, 0xA9, 0xA9)},
+       {"DarkGrey",        RGB(0xA9, 0xA9, 0xA9)},
        {"Gray",            RGB(0xC0, 0xC0, 0xC0)},
        {"Grey",            RGB(0xC0, 0xC0, 0xC0)},
        {"LightGray",       RGB(0xD3, 0xD3, 0xD3)},
@@ -2037,19 +2037,19 @@ gui_mch_get_color(char_u *name)
        {"LightRed",        RGB(0xFF, 0xA0, 0xA0)},
        {"DarkBlue",        RGB(0x00, 0x00, 0x80)},
        {"Blue",            RGB(0x00, 0x00, 0xFF)},
-       {"LightBlue",       RGB(0xA0, 0xA0, 0xFF)},
+       {"LightBlue",       RGB(0xAD, 0xD8, 0xE6)},
        {"DarkGreen",       RGB(0x00, 0x80, 0x00)},
        {"Green",           RGB(0x00, 0xFF, 0x00)},
-       {"LightGreen",      RGB(0xA0, 0xFF, 0xA0)},
+       {"LightGreen",      RGB(0x90, 0xEE, 0x90)},
        {"DarkCyan",        RGB(0x00, 0x80, 0x80)},
        {"Cyan",            RGB(0x00, 0xFF, 0xFF)},
-       {"LightCyan",       RGB(0xA0, 0xFF, 0xFF)},
+       {"LightCyan",       RGB(0xE0, 0xFF, 0xFF)},
        {"DarkMagenta",     RGB(0x80, 0x00, 0x80)},
        {"Magenta",         RGB(0xFF, 0x00, 0xFF)},
        {"LightMagenta",    RGB(0xFF, 0xA0, 0xFF)},
        {"Brown",           RGB(0x80, 0x40, 0x40)},
        {"Yellow",          RGB(0xFF, 0xFF, 0x00)},
-       {"LightYellow",     RGB(0xFF, 0xFF, 0xA0)},
+       {"LightYellow",     RGB(0xFF, 0xFF, 0xE0)},
        {"SeaGreen",        RGB(0x2E, 0x8B, 0x57)},
        {"Orange",          RGB(0xFF, 0xA5, 0x00)},
        {"Purple",          RGB(0xA0, 0x20, 0xF0)},

diff --git a/src/gui_w48.c b/src/gui_w48.c
index 4667dc7aad96ca8a7daf82fd9ce07a1ea9ef05f3..a6a8184a7c6b9e4e0d78378da2bfdf22aaf99ada 100644 (file)
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -1411,12 +1411,12 @@ gui_mch_get_color(char_u *name)
     static guicolor_tTable table[] =
     {
        {"Black",               RGB(0x00, 0x00, 0x00)},
-       {"DarkGray",            RGB(0x80, 0x80, 0x80)},
-       {"DarkGrey",            RGB(0x80, 0x80, 0x80)},
+       {"DarkGray",            RGB(0xA9, 0xA9, 0xA9)},
+       {"DarkGrey",            RGB(0xA9, 0xA9, 0xA9)},
        {"Gray",                RGB(0xC0, 0xC0, 0xC0)},
        {"Grey",                RGB(0xC0, 0xC0, 0xC0)},
-       {"LightGray",           RGB(0xE0, 0xE0, 0xE0)},
-       {"LightGrey",           RGB(0xE0, 0xE0, 0xE0)},
+       {"LightGray",           RGB(0xD3, 0xD3, 0xD3)},
+       {"LightGrey",           RGB(0xD3, 0xD3, 0xD3)},
        {"Gray10",              RGB(0x1A, 0x1A, 0x1A)},
        {"Grey10",              RGB(0x1A, 0x1A, 0x1A)},
        {"Gray20",              RGB(0x33, 0x33, 0x33)},
@@ -1441,19 +1441,19 @@ gui_mch_get_color(char_u *name)
        {"LightRed",            RGB(0xFF, 0xA0, 0xA0)},
        {"DarkBlue",            RGB(0x00, 0x00, 0x80)},
        {"Blue",                RGB(0x00, 0x00, 0xFF)},
-       {"LightBlue",           RGB(0xA0, 0xA0, 0xFF)},
+       {"LightBlue",           RGB(0xAD, 0xD8, 0xE6)},
        {"DarkGreen",           RGB(0x00, 0x80, 0x00)},
        {"Green",               RGB(0x00, 0xFF, 0x00)},
-       {"LightGreen",          RGB(0xA0, 0xFF, 0xA0)},
+       {"LightGreen",          RGB(0x90, 0xEE, 0x90)},
        {"DarkCyan",            RGB(0x00, 0x80, 0x80)},
        {"Cyan",                RGB(0x00, 0xFF, 0xFF)},
-       {"LightCyan",           RGB(0xA0, 0xFF, 0xFF)},
+       {"LightCyan",           RGB(0xE0, 0xFF, 0xFF)},
        {"DarkMagenta",         RGB(0x80, 0x00, 0x80)},
        {"Magenta",             RGB(0xFF, 0x00, 0xFF)},
        {"LightMagenta",        RGB(0xFF, 0xA0, 0xFF)},
        {"Brown",               RGB(0x80, 0x40, 0x40)},
        {"Yellow",              RGB(0xFF, 0xFF, 0x00)},
-       {"LightYellow",         RGB(0xFF, 0xFF, 0xA0)},
+       {"LightYellow",         RGB(0xFF, 0xFF, 0xE0)},
        {"DarkYellow",          RGB(0xBB, 0xBB, 0x00)},
        {"SeaGreen",            RGB(0x2E, 0x8B, 0x57)},
        {"Orange",              RGB(0xFF, 0xA5, 0x00)},

diff --git a/src/version.c b/src/version.c
index 542fc08385917f9f8d73bfb82d5c8528435a4dc5..ac4ac17194226af1ea73d8fa21e7a8f67c2c7ed8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    298,
 /**/
     297,
 /**/