To: vim_dev@googlegroups.com Subject: Patch 7.4.1786 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1786 Problem: Compiled-in colors do not match rgb.txt. Solution: Use the rgb.txt colors. (Kazunobu Kuriyama) Files: src/term.c *** ../vim-7.4.1785/src/term.c 2016-04-22 21:11:03.836844513 +0200 --- src/term.c 2016-04-24 15:39:50.558186914 +0200 *************** *** 1274,1291 **** 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 *)"gray10", RGB(0x1A, 0x1A, 0x1A)}, {(char_u *)"gray20", RGB(0x33, 0x33, 0x33)}, {(char_u *)"gray30", RGB(0x4D, 0x4D, 0x4D)}, --- 1274,1291 ---- static struct rgbcolor_table_S rgb_table[] = { {(char_u *)"black", RGB(0x00, 0x00, 0x00)}, ! {(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,1302 **** {(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 *)"grey10", RGB(0x1A, 0x1A, 0x1A)}, {(char_u *)"grey20", RGB(0x33, 0x33, 0x33)}, {(char_u *)"grey30", RGB(0x4D, 0x4D, 0x4D)}, --- 1295,1302 ---- {(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, 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,1328 **** {(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 *)"purple", RGB(0xA0, 0x20, 0xF0)}, ! {(char_u *)"red", RGB(0xDD, 0x08, 0x06)}, {(char_u *)"seagreen", RGB(0x2E, 0x8B, 0x57)}, {(char_u *)"slateblue", RGB(0x6A, 0x5A, 0xCD)}, ! {(char_u *)"violet", RGB(0x8D, 0x38, 0xC9)}, {(char_u *)"white", RGB(0xFF, 0xFF, 0xFF)}, ! {(char_u *)"yellow", RGB(0xFC, 0xF3, 0x05)}, }; static int --- 1306,1328 ---- {(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(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(0xFF, 0x00, 0x00)}, {(char_u *)"seagreen", RGB(0x2E, 0x8B, 0x57)}, {(char_u *)"slateblue", RGB(0x6A, 0x5A, 0xCD)}, ! {(char_u *)"violet", RGB(0xEE, 0x82, 0xEE)}, {(char_u *)"white", RGB(0xFF, 0xFF, 0xFF)}, ! {(char_u *)"yellow", RGB(0xFF, 0xFF, 0x00)}, }; static int *** ../vim-7.4.1785/src/version.c 2016-04-24 15:10:58.000089405 +0200 --- src/version.c 2016-04-24 15:36:40.520148979 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1786, /**/ -- CRONE: Who sent you? ARTHUR: The Knights Who Say Ni! CRONE: Aaaagh! (she looks around in rear) No! We have no shrubberies here. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///