aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 7.4.1774

Browse Source 
Problem:    Cterm true color feature has warnings.
Solution:   Add type casts.
This commit is contained in:
Bram Moolenaar
2016-04-22 11:49:06 +02:00
parent 380130f1e1
commit 902647d2df
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/screen.c
View File

@@ -7842,7 +7842,7 @@ screen_start_highlight(int attr)
else if (aep != NULL && cterm_normal_fg_bold && else if (aep != NULL && cterm_normal_fg_bold &&
#ifdef FEAT_TERMTRUECOLOR #ifdef FEAT_TERMTRUECOLOR
(p_guicolors ? (p_guicolors ?
(aep->ae_u.cterm.fg_rgb != INVALCOLOR): (aep->ae_u.cterm.fg_rgb != (long_u)INVALCOLOR):
#endif #endif
(t_colors > 1 && aep->ae_u.cterm.fg_color) (t_colors > 1 && aep->ae_u.cterm.fg_color)
#ifdef FEAT_TERMTRUECOLOR #ifdef FEAT_TERMTRUECOLOR
@@ -7871,9 +7871,9 @@ screen_start_highlight(int attr)
#ifdef FEAT_TERMTRUECOLOR #ifdef FEAT_TERMTRUECOLOR
if (p_guicolors) if (p_guicolors)
{ {
if (aep->ae_u.cterm.fg_rgb != INVALCOLOR) if (aep->ae_u.cterm.fg_rgb != (long_u)INVALCOLOR)
term_fg_rgb_color(aep->ae_u.cterm.fg_rgb); term_fg_rgb_color(aep->ae_u.cterm.fg_rgb);
if (aep->ae_u.cterm.bg_rgb != INVALCOLOR) if (aep->ae_u.cterm.bg_rgb != (long_u)INVALCOLOR)
term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); term_bg_rgb_color(aep->ae_u.cterm.bg_rgb);
} }
else else
@@ -7933,8 +7933,8 @@ screen_stop_highlight(void)
if (aep != NULL && if (aep != NULL &&
#ifdef FEAT_TERMTRUECOLOR #ifdef FEAT_TERMTRUECOLOR
(p_guicolors ? (p_guicolors ?
(aep->ae_u.cterm.fg_rgb != INVALCOLOR || (aep->ae_u.cterm.fg_rgb != (long_u)INVALCOLOR ||
aep->ae_u.cterm.bg_rgb != INVALCOLOR): aep->ae_u.cterm.bg_rgb != (long_u)INVALCOLOR):
#endif #endif
(aep->ae_u.cterm.fg_color || aep->ae_u.cterm.bg_color) (aep->ae_u.cterm.fg_color || aep->ae_u.cterm.bg_color)
#ifdef FEAT_TERMTRUECOLOR #ifdef FEAT_TERMTRUECOLOR
@@ -7991,9 +7991,9 @@ screen_stop_highlight(void)
#ifdef FEAT_TERMTRUECOLOR #ifdef FEAT_TERMTRUECOLOR
if (p_guicolors) if (p_guicolors)
{ {
if (cterm_normal_fg_gui_color != INVALCOLOR) if (cterm_normal_fg_gui_color != (long_u)INVALCOLOR)
term_fg_rgb_color(cterm_normal_fg_gui_color); term_fg_rgb_color(cterm_normal_fg_gui_color);
if (cterm_normal_bg_gui_color != INVALCOLOR) if (cterm_normal_bg_gui_color != (long_u)INVALCOLOR)
term_bg_rgb_color(cterm_normal_bg_gui_color); term_bg_rgb_color(cterm_normal_bg_gui_color);
} }
else else
@@ -8027,8 +8027,8 @@ reset_cterm_colors(void)
/* set Normal cterm colors */ /* set Normal cterm colors */
#ifdef FEAT_TERMTRUECOLOR #ifdef FEAT_TERMTRUECOLOR
if (p_guicolors ? if (p_guicolors ?
(cterm_normal_fg_gui_color != INVALCOLOR (cterm_normal_fg_gui_color != (long_u)INVALCOLOR
|| cterm_normal_bg_gui_color != INVALCOLOR): || cterm_normal_bg_gui_color != (long_u)INVALCOLOR):
(cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0)) (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0))
#else #else
if (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0) if (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0)
@@ -8960,7 +8960,7 @@ can_clear(char_u *p)
|| gui.in_use || gui.in_use
#endif #endif
#ifdef FEAT_TERMTRUECOLOR #ifdef FEAT_TERMTRUECOLOR
|| (p_guicolors && cterm_normal_bg_gui_color != INVALCOLOR) || (p_guicolors && cterm_normal_bg_gui_color != (long_u)INVALCOLOR)
#endif #endif
|| cterm_normal_bg_color == 0 || *T_UT != NUL)); || cterm_normal_bg_color == 0 || *T_UT != NUL));
} }

4
src/syntax.c
View File

@@ -8788,9 +8788,9 @@ hl_combine_attr(int char_attr, int prim_attr)
if (spell_aep->ae_u.cterm.bg_color > 0) if (spell_aep->ae_u.cterm.bg_color > 0)
new_en.ae_u.cterm.bg_color = spell_aep->ae_u.cterm.bg_color; new_en.ae_u.cterm.bg_color = spell_aep->ae_u.cterm.bg_color;
#ifdef FEAT_TERMTRUECOLOR #ifdef FEAT_TERMTRUECOLOR
if (spell_aep->ae_u.cterm.fg_rgb != INVALCOLOR) if (spell_aep->ae_u.cterm.fg_rgb != (long_u)INVALCOLOR)
new_en.ae_u.cterm.fg_rgb = spell_aep->ae_u.cterm.fg_rgb; new_en.ae_u.cterm.fg_rgb = spell_aep->ae_u.cterm.fg_rgb;
if (spell_aep->ae_u.cterm.bg_rgb != INVALCOLOR) if (spell_aep->ae_u.cterm.bg_rgb != (long_u)INVALCOLOR)
new_en.ae_u.cterm.bg_rgb = spell_aep->ae_u.cterm.bg_rgb; new_en.ae_u.cterm.bg_rgb = spell_aep->ae_u.cterm.bg_rgb;
#endif #endif
} }

7
src/term.c
View File

@@ -1383,9 +1383,8 @@ termtrue_mch_get_color(char_u *name)
{ {
int len; int len;
int pos; int pos;
char *color;
ignored = fgets(line, LINE_LEN, fd); (void)fgets(line, LINE_LEN, fd);
len = strlen(line); len = strlen(line);
if (len <= 1 || line[len-1] != '\n') if (len <= 1 || line[len-1] != '\n')
@@ -1397,9 +1396,7 @@ termtrue_mch_get_color(char_u *name)
if (i != 3) if (i != 3)
continue; continue;
color = line + pos; if (STRICMP(line + pos, name) == 0)
if (STRICMP(color, name) == 0)
{ {
fclose(fd); fclose(fd);
return (guicolor_T) RGB(r, g, b); return (guicolor_T) RGB(r, g, b);

2
src/version.c
View File

@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1774,
/**/ /**/
1773, 1773,
/**/ /**/