aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 7.4.1812

Browse Source 
Problem:    Failure on startup with Athena and Motif.
Solution:   Check for INVALCOLOR. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar
2016-05-01 13:09:57 +02:00
parent 3266c85a44
commit 187147aedd
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/syntax.c
View File

@@ -9261,8 +9261,8 @@ set_hl_attr(
at_en.ae_u.cterm.fg_color = sgp->sg_cterm_fg; at_en.ae_u.cterm.fg_color = sgp->sg_cterm_fg;
at_en.ae_u.cterm.bg_color = sgp->sg_cterm_bg; at_en.ae_u.cterm.bg_color = sgp->sg_cterm_bg;
# ifdef FEAT_TERMGUICOLORS # ifdef FEAT_TERMGUICOLORS
at_en.ae_u.cterm.fg_rgb = GUI_MCH_GET_RGB(sgp->sg_gui_fg); at_en.ae_u.cterm.fg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_fg);
at_en.ae_u.cterm.bg_rgb = GUI_MCH_GET_RGB(sgp->sg_gui_bg); at_en.ae_u.cterm.bg_rgb = GUI_MCH_GET_RGB2(sgp->sg_gui_bg);
# endif # endif
sgp->sg_cterm_attr = get_attr_entry(&cterm_attr_table, &at_en); sgp->sg_cterm_attr = get_attr_entry(&cterm_attr_table, &at_en);
} }

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 */
/**/
1812,
/**/ /**/
1811, 1811,
/**/ /**/

10
src/vim.h
View File

@@ -1561,14 +1561,23 @@ typedef UINT32_TYPEDEF UINT32_T;
#ifdef FEAT_GUI #ifdef FEAT_GUI
# ifdef FEAT_TERMGUICOLORS # ifdef FEAT_TERMGUICOLORS
# define GUI_FUNCTION(f) (gui.in_use ? gui_##f : termgui_##f) # define GUI_FUNCTION(f) (gui.in_use ? gui_##f : termgui_##f)
# define GUI_FUNCTION2(f, pixel) (gui.in_use \
? ((pixel) != INVALCOLOR \
? gui_##f((pixel)) \
: (long_u)INVALCOLOR) \
: termgui_##f((pixel)))
# define USE_24BIT (gui.in_use || p_tgc) # define USE_24BIT (gui.in_use || p_tgc)
# else # else
# define GUI_FUNCTION(f) gui_##f # define GUI_FUNCTION(f) gui_##f
# define GUI_FUNCTION2(f,pixel) ((pixel) != INVALCOLOR \
? gui_##f((pixel)) \
: (long_u)INVALCOLOR)
# define USE_24BIT gui.in_use # define USE_24BIT gui.in_use
# endif # endif
#else #else
# ifdef FEAT_TERMGUICOLORS # ifdef FEAT_TERMGUICOLORS
# define GUI_FUNCTION(f) termgui_##f # define GUI_FUNCTION(f) termgui_##f
# define GUI_FUNCTION2(f, pixel) termgui_##f((pixel))
# define USE_24BIT p_tgc # define USE_24BIT p_tgc
# endif # endif
#endif #endif
@@ -1579,6 +1588,7 @@ typedef UINT32_TYPEDEF UINT32_T;
#endif #endif
#ifdef GUI_FUNCTION #ifdef GUI_FUNCTION
# define GUI_MCH_GET_RGB GUI_FUNCTION(mch_get_rgb) # define GUI_MCH_GET_RGB GUI_FUNCTION(mch_get_rgb)
# define GUI_MCH_GET_RGB2(pixel) GUI_FUNCTION2(mch_get_rgb, (pixel))
# define GUI_MCH_GET_COLOR GUI_FUNCTION(mch_get_color) # define GUI_MCH_GET_COLOR GUI_FUNCTION(mch_get_color)
# define GUI_GET_COLOR GUI_FUNCTION(get_color) # define GUI_GET_COLOR GUI_FUNCTION(get_color)
#endif #endif