Skip to content

Commit f994712

Browse files
splhacksplhack
committed
Merge remote-tracking branch 'vim/master'
2 parents 0afe480 + 283ee8b commit f994712

File tree

2 files changed

+60
-54
lines changed

2 files changed

+60
-54
lines changed

‎src/term.c‎

Lines changed: 58 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6068,8 +6068,12 @@ hex_digit(int c)
60686068
guicolor_T
60696069
gui_get_color_cmn(char_u *name)
60706070
{
6071-
#define TORGB(r, g, b) ((r<<16) | (g<<8) | (b))
6072-
#define LINE_LEN 100
6071+
/* On MS-Windows an RGB macro is available and it's different from ours,
6072+
* but does what is needed. */
6073+
# ifndef RGB
6074+
# define RGB(r, g, b) ((r<<16) | (g<<8) | (b))
6075+
# endif
6076+
# define LINE_LEN 100
60736077
FILE *fd;
60746078
char line[LINE_LEN];
60756079
char_u *fname;
@@ -6082,63 +6086,63 @@ gui_get_color_cmn(char_u *name)
60826086
};
60836087

60846088
static struct rgbcolor_table_S rgb_table[] = {
6085-
{(char_u *)"black", TORGB(0x00, 0x00, 0x00)},
6086-
{(char_u *)"blue", TORGB(0x00, 0x00, 0xFF)},
6087-
{(char_u *)"brown", TORGB(0xA5, 0x2A, 0x2A)},
6088-
{(char_u *)"cyan", TORGB(0x00, 0xFF, 0xFF)},
6089-
{(char_u *)"darkblue", TORGB(0x00, 0x00, 0x8B)},
6090-
{(char_u *)"darkcyan", TORGB(0x00, 0x8B, 0x8B)},
6091-
{(char_u *)"darkgray", TORGB(0xA9, 0xA9, 0xA9)},
6092-
{(char_u *)"darkgreen", TORGB(0x00, 0x64, 0x00)},
6093-
{(char_u *)"darkgrey", TORGB(0xA9, 0xA9, 0xA9)},
6094-
{(char_u *)"darkmagenta", TORGB(0x8B, 0x00, 0x8B)},
6095-
{(char_u *)"darkred", TORGB(0x8B, 0x00, 0x00)},
6096-
{(char_u *)"darkyellow", TORGB(0x8B, 0x8B, 0x00)}, /* No X11 */
6097-
{(char_u *)"gray", TORGB(0xBE, 0xBE, 0xBE)},
6098-
{(char_u *)"gray10", TORGB(0x1A, 0x1A, 0x1A)},
6099-
{(char_u *)"gray20", TORGB(0x33, 0x33, 0x33)},
6100-
{(char_u *)"gray30", TORGB(0x4D, 0x4D, 0x4D)},
6101-
{(char_u *)"gray40", TORGB(0x66, 0x66, 0x66)},
6102-
{(char_u *)"gray50", TORGB(0x7F, 0x7F, 0x7F)},
6103-
{(char_u *)"gray60", TORGB(0x99, 0x99, 0x99)},
6104-
{(char_u *)"gray70", TORGB(0xB3, 0xB3, 0xB3)},
6105-
{(char_u *)"gray80", TORGB(0xCC, 0xCC, 0xCC)},
6106-
{(char_u *)"gray90", TORGB(0xE5, 0xE5, 0xE5)},
6107-
{(char_u *)"green", TORGB(0x00, 0xFF, 0x00)},
6108-
{(char_u *)"grey", TORGB(0xBE, 0xBE, 0xBE)},
6109-
{(char_u *)"grey10", TORGB(0x1A, 0x1A, 0x1A)},
6110-
{(char_u *)"grey20", TORGB(0x33, 0x33, 0x33)},
6111-
{(char_u *)"grey30", TORGB(0x4D, 0x4D, 0x4D)},
6112-
{(char_u *)"grey40", TORGB(0x66, 0x66, 0x66)},
6113-
{(char_u *)"grey50", TORGB(0x7F, 0x7F, 0x7F)},
6114-
{(char_u *)"grey60", TORGB(0x99, 0x99, 0x99)},
6115-
{(char_u *)"grey70", TORGB(0xB3, 0xB3, 0xB3)},
6116-
{(char_u *)"grey80", TORGB(0xCC, 0xCC, 0xCC)},
6117-
{(char_u *)"grey90", TORGB(0xE5, 0xE5, 0xE5)},
6118-
{(char_u *)"lightblue", TORGB(0xAD, 0xD8, 0xE6)},
6119-
{(char_u *)"lightcyan", TORGB(0xE0, 0xFF, 0xFF)},
6120-
{(char_u *)"lightgray", TORGB(0xD3, 0xD3, 0xD3)},
6121-
{(char_u *)"lightgreen", TORGB(0x90, 0xEE, 0x90)},
6122-
{(char_u *)"lightgrey", TORGB(0xD3, 0xD3, 0xD3)},
6123-
{(char_u *)"lightmagenta", TORGB(0xFF, 0x8B, 0xFF)}, /* No X11 */
6124-
{(char_u *)"lightred", TORGB(0xFF, 0x8B, 0x8B)}, /* No X11 */
6125-
{(char_u *)"lightyellow", TORGB(0xFF, 0xFF, 0xE0)},
6126-
{(char_u *)"magenta", TORGB(0xFF, 0x00, 0xFF)},
6127-
{(char_u *)"orange", TORGB(0xFF, 0xA5, 0x00)},
6128-
{(char_u *)"purple", TORGB(0xA0, 0x20, 0xF0)},
6129-
{(char_u *)"red", TORGB(0xFF, 0x00, 0x00)},
6130-
{(char_u *)"seagreen", TORGB(0x2E, 0x8B, 0x57)},
6131-
{(char_u *)"slateblue", TORGB(0x6A, 0x5A, 0xCD)},
6132-
{(char_u *)"violet", TORGB(0xEE, 0x82, 0xEE)},
6133-
{(char_u *)"white", TORGB(0xFF, 0xFF, 0xFF)},
6134-
{(char_u *)"yellow", TORGB(0xFF, 0xFF, 0x00)},
6089+
{(char_u *)"black", RGB(0x00, 0x00, 0x00)},
6090+
{(char_u *)"blue", RGB(0x00, 0x00, 0xFF)},
6091+
{(char_u *)"brown", RGB(0xA5, 0x2A, 0x2A)},
6092+
{(char_u *)"cyan", RGB(0x00, 0xFF, 0xFF)},
6093+
{(char_u *)"darkblue", RGB(0x00, 0x00, 0x8B)},
6094+
{(char_u *)"darkcyan", RGB(0x00, 0x8B, 0x8B)},
6095+
{(char_u *)"darkgray", RGB(0xA9, 0xA9, 0xA9)},
6096+
{(char_u *)"darkgreen", RGB(0x00, 0x64, 0x00)},
6097+
{(char_u *)"darkgrey", RGB(0xA9, 0xA9, 0xA9)},
6098+
{(char_u *)"darkmagenta", RGB(0x8B, 0x00, 0x8B)},
6099+
{(char_u *)"darkred", RGB(0x8B, 0x00, 0x00)},
6100+
{(char_u *)"darkyellow", RGB(0x8B, 0x8B, 0x00)}, /* No X11 */
6101+
{(char_u *)"gray", RGB(0xBE, 0xBE, 0xBE)},
6102+
{(char_u *)"gray10", RGB(0x1A, 0x1A, 0x1A)},
6103+
{(char_u *)"gray20", RGB(0x33, 0x33, 0x33)},
6104+
{(char_u *)"gray30", RGB(0x4D, 0x4D, 0x4D)},
6105+
{(char_u *)"gray40", RGB(0x66, 0x66, 0x66)},
6106+
{(char_u *)"gray50", RGB(0x7F, 0x7F, 0x7F)},
6107+
{(char_u *)"gray60", RGB(0x99, 0x99, 0x99)},
6108+
{(char_u *)"gray70", RGB(0xB3, 0xB3, 0xB3)},
6109+
{(char_u *)"gray80", RGB(0xCC, 0xCC, 0xCC)},
6110+
{(char_u *)"gray90", RGB(0xE5, 0xE5, 0xE5)},
6111+
{(char_u *)"green", RGB(0x00, 0xFF, 0x00)},
6112+
{(char_u *)"grey", RGB(0xBE, 0xBE, 0xBE)},
6113+
{(char_u *)"grey10", RGB(0x1A, 0x1A, 0x1A)},
6114+
{(char_u *)"grey20", RGB(0x33, 0x33, 0x33)},
6115+
{(char_u *)"grey30", RGB(0x4D, 0x4D, 0x4D)},
6116+
{(char_u *)"grey40", RGB(0x66, 0x66, 0x66)},
6117+
{(char_u *)"grey50", RGB(0x7F, 0x7F, 0x7F)},
6118+
{(char_u *)"grey60", RGB(0x99, 0x99, 0x99)},
6119+
{(char_u *)"grey70", RGB(0xB3, 0xB3, 0xB3)},
6120+
{(char_u *)"grey80", RGB(0xCC, 0xCC, 0xCC)},
6121+
{(char_u *)"grey90", RGB(0xE5, 0xE5, 0xE5)},
6122+
{(char_u *)"lightblue", RGB(0xAD, 0xD8, 0xE6)},
6123+
{(char_u *)"lightcyan", RGB(0xE0, 0xFF, 0xFF)},
6124+
{(char_u *)"lightgray", RGB(0xD3, 0xD3, 0xD3)},
6125+
{(char_u *)"lightgreen", RGB(0x90, 0xEE, 0x90)},
6126+
{(char_u *)"lightgrey", RGB(0xD3, 0xD3, 0xD3)},
6127+
{(char_u *)"lightmagenta", RGB(0xFF, 0x8B, 0xFF)}, /* No X11 */
6128+
{(char_u *)"lightred", RGB(0xFF, 0x8B, 0x8B)}, /* No X11 */
6129+
{(char_u *)"lightyellow", RGB(0xFF, 0xFF, 0xE0)},
6130+
{(char_u *)"magenta", RGB(0xFF, 0x00, 0xFF)},
6131+
{(char_u *)"orange", RGB(0xFF, 0xA5, 0x00)},
6132+
{(char_u *)"purple", RGB(0xA0, 0x20, 0xF0)},
6133+
{(char_u *)"red", RGB(0xFF, 0x00, 0x00)},
6134+
{(char_u *)"seagreen", RGB(0x2E, 0x8B, 0x57)},
6135+
{(char_u *)"slateblue", RGB(0x6A, 0x5A, 0xCD)},
6136+
{(char_u *)"violet", RGB(0xEE, 0x82, 0xEE)},
6137+
{(char_u *)"white", RGB(0xFF, 0xFF, 0xFF)},
6138+
{(char_u *)"yellow", RGB(0xFF, 0xFF, 0x00)},
61356139
};
61366140

61376141

61386142
if (name[0] == '#' && STRLEN(name) == 7)
61396143
{
61406144
/* Name is in "#rrggbb" format */
6141-
color = TORGB(((hex_digit(name[1]) << 4) + hex_digit(name[2])),
6145+
color = RGB(((hex_digit(name[1]) << 4) + hex_digit(name[2])),
61426146
((hex_digit(name[3]) << 4) + hex_digit(name[4])),
61436147
((hex_digit(name[5]) << 4) + hex_digit(name[6])));
61446148
if (color > 0xffffff)
@@ -6188,7 +6192,7 @@ gui_get_color_cmn(char_u *name)
61886192
if (STRICMP(line + pos, name) == 0)
61896193
{
61906194
fclose(fd);
6191-
return (guicolor_T) TORGB(r, g, b);
6195+
return (guicolor_T)RGB(r, g, b);
61926196
}
61936197
}
61946198
fclose(fd);

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,8 @@ static char *(features[]) =
768768

769769
static int included_patches[] =
770770
{ /* Add new patch number below this line */
771+
/**/
772+
1796,
771773
/**/
772774
1795,
773775
/**/

0 commit comments

Comments
 (0)