To: vim_dev@googlegroups.com Subject: Patch 7.4.2243 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2243 Problem: Warning for assigning negative value to unsigned. (Danek Duvall) Solution: Make cterm_normal_fg_gui_color and _bg_ guicolor_T, cast to long_u only when an unsigned is needed. Files: src/structs.h, src/globals.h, src/screen.c, src/term.c, src/syntax.c, src/gui_gtk_x11.c, src/gui.c, src/gui_mac.c, src/gui_photon.c, src/gui_w32.c, src/gui_x11.c, src/proto/term.pro, src/proto/gui_gtk_x11.pro, src/proto/gui_mac.pro, src/proto/gui_photon.pro, src/proto/gui_w32.pro, src/proto/gui_x11.pro *** ../vim-7.4.2242/src/structs.h 2016-08-16 16:08:14.612354306 +0200 --- src/structs.h 2016-08-22 22:32:50.219074788 +0200 *************** *** 92,99 **** # ifdef FEAT_XCLIPBOARD # include # endif ! # define guicolor_T long_u /* avoid error in prototypes and ! * make FEAT_TERMGUICOLORS work */ # define INVALCOLOR ((guicolor_T)0x1ffffff) #endif --- 92,98 ---- # ifdef FEAT_XCLIPBOARD # include # endif ! # define guicolor_T long # define INVALCOLOR ((guicolor_T)0x1ffffff) #endif *************** *** 929,936 **** short_u fg_color; /* foreground color number */ short_u bg_color; /* background color number */ # ifdef FEAT_TERMGUICOLORS ! long_u fg_rgb; /* foreground color RGB */ ! long_u bg_rgb; /* background color RGB */ # endif } cterm; # ifdef FEAT_GUI --- 928,935 ---- short_u fg_color; /* foreground color number */ short_u bg_color; /* background color number */ # ifdef FEAT_TERMGUICOLORS ! guicolor_T fg_rgb; /* foreground color RGB */ ! guicolor_T bg_rgb; /* background color RGB */ # endif } cterm; # ifdef FEAT_GUI *** ../vim-7.4.2242/src/globals.h 2016-08-16 19:21:05.528394945 +0200 --- src/globals.h 2016-08-22 22:18:30.150629990 +0200 *************** *** 368,375 **** EXTERN int cterm_normal_fg_bold INIT(= 0); EXTERN int cterm_normal_bg_color INIT(= 0); #ifdef FEAT_TERMGUICOLORS ! EXTERN long_u cterm_normal_fg_gui_color INIT(= INVALCOLOR); ! EXTERN long_u cterm_normal_bg_gui_color INIT(= INVALCOLOR); #endif #ifdef FEAT_AUTOCMD --- 368,375 ---- EXTERN int cterm_normal_fg_bold INIT(= 0); EXTERN int cterm_normal_bg_color INIT(= 0); #ifdef FEAT_TERMGUICOLORS ! EXTERN guicolor_T cterm_normal_fg_gui_color INIT(= INVALCOLOR); ! EXTERN guicolor_T cterm_normal_bg_gui_color INIT(= INVALCOLOR); #endif #ifdef FEAT_AUTOCMD *** ../vim-7.4.2242/src/screen.c 2016-08-16 16:08:14.612354306 +0200 --- src/screen.c 2016-08-22 22:41:00.742649871 +0200 *************** *** 7865,7871 **** else if (aep != NULL && cterm_normal_fg_bold && #ifdef FEAT_TERMGUICOLORS (p_tgc ? ! (aep->ae_u.cterm.fg_rgb != (long_u)INVALCOLOR): #endif (t_colors > 1 && aep->ae_u.cterm.fg_color) #ifdef FEAT_TERMGUICOLORS --- 7865,7871 ---- else if (aep != NULL && cterm_normal_fg_bold && #ifdef FEAT_TERMGUICOLORS (p_tgc ? ! (aep->ae_u.cterm.fg_rgb != INVALCOLOR): #endif (t_colors > 1 && aep->ae_u.cterm.fg_color) #ifdef FEAT_TERMGUICOLORS *************** *** 7894,7902 **** #ifdef FEAT_TERMGUICOLORS if (p_tgc) { ! if (aep->ae_u.cterm.fg_rgb != (long_u)INVALCOLOR) term_fg_rgb_color(aep->ae_u.cterm.fg_rgb); ! if (aep->ae_u.cterm.bg_rgb != (long_u)INVALCOLOR) term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); } else --- 7894,7902 ---- #ifdef FEAT_TERMGUICOLORS if (p_tgc) { ! if (aep->ae_u.cterm.fg_rgb != INVALCOLOR) term_fg_rgb_color(aep->ae_u.cterm.fg_rgb); ! if (aep->ae_u.cterm.bg_rgb != INVALCOLOR) term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); } else *************** *** 7956,7963 **** if (aep != NULL && #ifdef FEAT_TERMGUICOLORS (p_tgc ? ! (aep->ae_u.cterm.fg_rgb != (long_u)INVALCOLOR || ! aep->ae_u.cterm.bg_rgb != (long_u)INVALCOLOR): #endif (aep->ae_u.cterm.fg_color || aep->ae_u.cterm.bg_color) #ifdef FEAT_TERMGUICOLORS --- 7956,7963 ---- if (aep != NULL && #ifdef FEAT_TERMGUICOLORS (p_tgc ? ! (aep->ae_u.cterm.fg_rgb != INVALCOLOR ! || aep->ae_u.cterm.bg_rgb != INVALCOLOR): #endif (aep->ae_u.cterm.fg_color || aep->ae_u.cterm.bg_color) #ifdef FEAT_TERMGUICOLORS *************** *** 8014,8022 **** #ifdef FEAT_TERMGUICOLORS if (p_tgc) { ! if (cterm_normal_fg_gui_color != (long_u)INVALCOLOR) term_fg_rgb_color(cterm_normal_fg_gui_color); ! if (cterm_normal_bg_gui_color != (long_u)INVALCOLOR) term_bg_rgb_color(cterm_normal_bg_gui_color); } else --- 8014,8022 ---- #ifdef FEAT_TERMGUICOLORS if (p_tgc) { ! if (cterm_normal_fg_gui_color != INVALCOLOR) term_fg_rgb_color(cterm_normal_fg_gui_color); ! if (cterm_normal_bg_gui_color != INVALCOLOR) term_bg_rgb_color(cterm_normal_bg_gui_color); } else *************** *** 8049,8058 **** { /* set Normal cterm colors */ #ifdef FEAT_TERMGUICOLORS ! if (p_tgc ? ! (cterm_normal_fg_gui_color != (long_u)INVALCOLOR ! || cterm_normal_bg_gui_color != (long_u)INVALCOLOR): ! (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0)) #else if (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0) #endif --- 8049,8057 ---- { /* set Normal cterm colors */ #ifdef FEAT_TERMGUICOLORS ! if (p_tgc ? (cterm_normal_fg_gui_color != INVALCOLOR ! || cterm_normal_bg_gui_color != INVALCOLOR) ! : (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0)) #else if (cterm_normal_fg_color > 0 || cterm_normal_bg_color > 0) #endif *************** *** 8983,8989 **** || gui.in_use #endif #ifdef FEAT_TERMGUICOLORS ! || (p_tgc && cterm_normal_bg_gui_color == (long_u)INVALCOLOR) || (!p_tgc && cterm_normal_bg_color == 0) #else || cterm_normal_bg_color == 0 --- 8982,8988 ---- || gui.in_use #endif #ifdef FEAT_TERMGUICOLORS ! || (p_tgc && cterm_normal_bg_gui_color == INVALCOLOR) || (!p_tgc && cterm_normal_bg_color == 0) #else || cterm_normal_bg_color == 0 *** ../vim-7.4.2242/src/term.c 2016-08-21 21:03:33.251131139 +0200 --- src/term.c 2016-08-22 22:42:54.085629451 +0200 *************** *** 77,85 **** static struct builtin_term *find_builtin_term(char_u *name); static void parse_builtin_tcap(char_u *s); static void term_color(char_u *s, int n); - #ifdef FEAT_TERMGUICOLORS - static void term_rgb_color(char_u *s, long_u rgb); - #endif static void gather_termleader(void); #ifdef FEAT_TERMRESPONSE static void req_codes_from_term(void); --- 77,82 ---- *************** *** 1282,1291 **** return t; } ! long_u termgui_mch_get_rgb(guicolor_T color) { ! return (long_u)color; } #endif --- 1279,1288 ---- return t; } ! guicolor_T termgui_mch_get_rgb(guicolor_T color) { ! return color; } #endif *************** *** 2634,2657 **** } #if defined(FEAT_TERMGUICOLORS) || defined(PROTO) - void - term_fg_rgb_color(long_u rgb) - { - term_rgb_color(T_8F, rgb); - } - - void - term_bg_rgb_color(long_u rgb) - { - term_rgb_color(T_8B, rgb); - } ! #define RED(rgb) ((rgb>>16)&0xFF) ! #define GREEN(rgb) ((rgb>> 8)&0xFF) ! #define BLUE(rgb) ((rgb )&0xFF) static void ! term_rgb_color(char_u *s, long_u rgb) { #define MAX_COLOR_STR_LEN 100 char buf[MAX_COLOR_STR_LEN]; --- 2631,2643 ---- } #if defined(FEAT_TERMGUICOLORS) || defined(PROTO) ! #define RED(rgb) (((long_u)(rgb) >> 16) & 0xFF) ! #define GREEN(rgb) (((long_u)(rgb) >> 8) & 0xFF) ! #define BLUE(rgb) (((long_u)(rgb) ) & 0xFF) static void ! term_rgb_color(char_u *s, guicolor_T rgb) { #define MAX_COLOR_STR_LEN 100 char buf[MAX_COLOR_STR_LEN]; *************** *** 2660,2665 **** --- 2646,2663 ---- (char *)s, RED(rgb), GREEN(rgb), BLUE(rgb)); OUT_STR(buf); } + + void + term_fg_rgb_color(guicolor_T rgb) + { + term_rgb_color(T_8F, rgb); + } + + void + term_bg_rgb_color(guicolor_T rgb) + { + term_rgb_color(T_8B, rgb); + } #endif #if (defined(FEAT_TITLE) && (defined(UNIX) || defined(VMS) \ *** ../vim-7.4.2242/src/syntax.c 2016-08-14 19:54:16.332930147 +0200 --- src/syntax.c 2016-08-22 22:41:13.386536002 +0200 *************** *** 8488,8494 **** return gui.norm_pixel; #endif #ifdef FEAT_TERMGUICOLORS ! if (cterm_normal_fg_gui_color != (long_u)INVALCOLOR) return cterm_normal_fg_gui_color; /* Guess that the foreground is black or white. */ return GUI_GET_COLOR((char_u *)(*p_bg == 'l' ? "black" : "white")); --- 8488,8494 ---- return gui.norm_pixel; #endif #ifdef FEAT_TERMGUICOLORS ! if (cterm_normal_fg_gui_color != INVALCOLOR) return cterm_normal_fg_gui_color; /* Guess that the foreground is black or white. */ return GUI_GET_COLOR((char_u *)(*p_bg == 'l' ? "black" : "white")); *************** *** 8503,8509 **** return gui.back_pixel; #endif #ifdef FEAT_TERMGUICOLORS ! if (cterm_normal_bg_gui_color != (long_u)INVALCOLOR) return cterm_normal_bg_gui_color; /* Guess that the background is white or black. */ return GUI_GET_COLOR((char_u *)(*p_bg == 'l' ? "white" : "black")); --- 8503,8509 ---- return gui.back_pixel; #endif #ifdef FEAT_TERMGUICOLORS ! if (cterm_normal_bg_gui_color != INVALCOLOR) return cterm_normal_bg_gui_color; /* Guess that the background is white or black. */ return GUI_GET_COLOR((char_u *)(*p_bg == 'l' ? "white" : "black")); *************** *** 8782,8790 **** if (spell_aep->ae_u.cterm.bg_color > 0) new_en.ae_u.cterm.bg_color = spell_aep->ae_u.cterm.bg_color; #ifdef FEAT_TERMGUICOLORS ! 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; ! 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; #endif } --- 8782,8790 ---- if (spell_aep->ae_u.cterm.bg_color > 0) new_en.ae_u.cterm.bg_color = spell_aep->ae_u.cterm.bg_color; #ifdef FEAT_TERMGUICOLORS ! if (spell_aep->ae_u.cterm.fg_rgb != INVALCOLOR) new_en.ae_u.cterm.fg_rgb = spell_aep->ae_u.cterm.fg_rgb; ! if (spell_aep->ae_u.cterm.bg_rgb != INVALCOLOR) new_en.ae_u.cterm.bg_rgb = spell_aep->ae_u.cterm.bg_rgb; #endif } *************** *** 9076,9082 **** color = HL_TABLE()[id - 1].sg_gui_bg; if (color == INVALCOLOR) return NULL; ! rgb = GUI_MCH_GET_RGB(color); sprintf((char *)buf, "#%02x%02x%02x", (unsigned)(rgb >> 16), (unsigned)(rgb >> 8) & 255, --- 9076,9082 ---- color = HL_TABLE()[id - 1].sg_gui_bg; if (color == INVALCOLOR) return NULL; ! rgb = (long_u)GUI_MCH_GET_RGB(color); sprintf((char *)buf, "#%02x%02x%02x", (unsigned)(rgb >> 16), (unsigned)(rgb >> 8) & 255, *** ../vim-7.4.2242/src/gui_gtk_x11.c 2016-08-14 20:27:22.094923695 +0200 --- src/gui_gtk_x11.c 2016-08-22 22:25:20.571031947 +0200 *************** *** 7020,7026 **** /* * Return the RGB value of a pixel as long. */ ! long_u gui_mch_get_rgb(guicolor_T pixel) { #if GTK_CHECK_VERSION(3,0,0) --- 7020,7026 ---- /* * Return the RGB value of a pixel as long. */ ! guicolor_T gui_mch_get_rgb(guicolor_T pixel) { #if GTK_CHECK_VERSION(3,0,0) *************** *** 7031,7039 **** gdk_colormap_query_color(gtk_widget_get_colormap(gui.drawarea), (unsigned long)pixel, &color); ! return (((unsigned)color.red & 0xff00) << 8) | ((unsigned)color.green & 0xff00) ! | (((unsigned)color.blue & 0xff00) >> 8); #endif } --- 7031,7040 ---- gdk_colormap_query_color(gtk_widget_get_colormap(gui.drawarea), (unsigned long)pixel, &color); ! return (guicolor_T)( ! (((unsigned)color.red & 0xff00) << 8) | ((unsigned)color.green & 0xff00) ! | (((unsigned)color.blue & 0xff00) >> 8)); #endif } *** ../vim-7.4.2242/src/gui.c 2016-08-12 14:08:20.678029453 +0200 --- src/gui.c 2016-08-22 22:26:10.254596386 +0200 *************** *** 4741,4747 **** int gui_get_lightness(guicolor_T pixel) { ! long_u rgb = gui_mch_get_rgb(pixel); return (int)( (((rgb >> 16) & 0xff) * 299) + (((rgb >> 8) & 0xff) * 587) --- 4741,4747 ---- int gui_get_lightness(guicolor_T pixel) { ! long_u rgb = (long_u)gui_mch_get_rgb(pixel); return (int)( (((rgb >> 16) & 0xff) * 299) + (((rgb >> 8) & 0xff) * 587) *** ../vim-7.4.2242/src/gui_mac.c 2016-08-14 16:07:44.717705432 +0200 --- src/gui_mac.c 2016-08-22 22:26:59.598163808 +0200 *************** *** 5181,5190 **** /* * Return the RGB value of a pixel as long. */ ! long_u gui_mch_get_rgb(guicolor_T pixel) { ! return (Red(pixel) << 16) + (Green(pixel) << 8) + Blue(pixel); } --- 5181,5190 ---- /* * Return the RGB value of a pixel as long. */ ! guicolor_T gui_mch_get_rgb(guicolor_T pixel) { ! return (guicolor_T)((Red(pixel) << 16) + (Green(pixel) << 8) + Blue(pixel)); } *** ../vim-7.4.2242/src/gui_photon.c 2016-07-07 16:42:57.318788362 +0200 --- src/gui_photon.c 2016-08-22 22:27:48.665733649 +0200 *************** *** 1933,1942 **** /* * Return the RGB value of a pixel as a long. */ ! long_u gui_mch_get_rgb(guicolor_T pixel) { ! return PgRGB(PgRedValue(pixel), PgGreenValue(pixel), PgBlueValue(pixel)); } void --- 1933,1943 ---- /* * Return the RGB value of a pixel as a long. */ ! guicolor_T gui_mch_get_rgb(guicolor_T pixel) { ! return (guicolor_T)(PgRGB(PgRedValue(pixel), ! PgGreenValue(pixel), PgBlueValue(pixel))); } void *** ../vim-7.4.2242/src/gui_w32.c 2016-08-10 20:53:01.675116208 +0200 --- src/gui_w32.c 2016-08-22 22:28:02.169615264 +0200 *************** *** 2263,2273 **** /* * Return the RGB value of a pixel as a long. */ ! long_u gui_mch_get_rgb(guicolor_T pixel) { ! return (GetRValue(pixel) << 16) + (GetGValue(pixel) << 8) ! + GetBValue(pixel); } #if defined(FEAT_GUI_DIALOG) || defined(PROTO) --- 2263,2273 ---- /* * Return the RGB value of a pixel as a long. */ ! guicolor_T gui_mch_get_rgb(guicolor_T pixel) { ! return (guicolor_T)((GetRValue(pixel) << 16) + (GetGValue(pixel) << 8) ! + GetBValue(pixel)); } #if defined(FEAT_GUI_DIALOG) || defined(PROTO) *** ../vim-7.4.2242/src/gui_x11.c 2016-07-23 14:35:04.063079009 +0200 --- src/gui_x11.c 2016-08-22 22:28:32.133352582 +0200 *************** *** 3095,3101 **** /* * Return the RGB value of a pixel as a long. */ ! long_u gui_mch_get_rgb(guicolor_T pixel) { XColor xc; --- 3095,3101 ---- /* * Return the RGB value of a pixel as a long. */ ! guicolor_T gui_mch_get_rgb(guicolor_T pixel) { XColor xc; *************** *** 3105,3112 **** xc.pixel = pixel; XQueryColor(gui.dpy, colormap, &xc); ! return ((xc.red & 0xff00) << 8) + (xc.green & 0xff00) ! + ((unsigned)xc.blue >> 8); } /* --- 3105,3112 ---- xc.pixel = pixel; XQueryColor(gui.dpy, colormap, &xc); ! return (guicolor_T)(((xc.red & 0xff00) << 8) + (xc.green & 0xff00) ! + ((unsigned)xc.blue >> 8)); } /* *** ../vim-7.4.2242/src/proto/term.pro 2016-04-29 22:58:25.622876633 +0200 --- src/proto/term.pro 2016-08-22 22:38:03.184249907 +0200 *************** *** 1,7 **** /* term.c */ guicolor_T termgui_mch_get_color(char_u *name); guicolor_T termgui_get_color(char_u *name); ! long_u termgui_mch_get_rgb(guicolor_T color); int set_termname(char_u *term); void set_mouse_termcode(int n, char_u *s); void del_mouse_termcode(int n); --- 1,7 ---- /* term.c */ guicolor_T termgui_mch_get_color(char_u *name); guicolor_T termgui_get_color(char_u *name); ! guicolor_T termgui_mch_get_rgb(guicolor_T color); int set_termname(char_u *term); void set_mouse_termcode(int n, char_u *s); void del_mouse_termcode(int n); *************** *** 25,32 **** void term_set_winsize(int width, int height); void term_fg_color(int n); void term_bg_color(int n); ! void term_fg_rgb_color(long_u rgb); ! void term_bg_rgb_color(long_u rgb); void term_settitle(char_u *title); void ttest(int pairs); void add_long_to_buf(long_u val, char_u *dst); --- 25,32 ---- void term_set_winsize(int width, int height); void term_fg_color(int n); void term_bg_color(int n); ! void term_fg_rgb_color(guicolor_T rgb); ! void term_bg_rgb_color(guicolor_T rgb); void term_settitle(char_u *title); void ttest(int pairs); void add_long_to_buf(long_u val, char_u *dst); *** ../vim-7.4.2242/src/proto/gui_gtk_x11.pro 2016-08-10 21:28:41.059332614 +0200 --- src/proto/gui_gtk_x11.pro 2016-08-22 22:38:10.452184376 +0200 *************** *** 66,72 **** void gui_mch_menu_hidden(vimmenu_T *menu, int hidden); void gui_mch_draw_menubar(void); void gui_mch_enable_scrollbar(scrollbar_T *sb, int flag); ! long_u gui_mch_get_rgb(guicolor_T pixel); void gui_mch_getmouse(int *x, int *y); void gui_mch_setmouse(int x, int y); void gui_mch_mousehide(int hide); --- 66,72 ---- void gui_mch_menu_hidden(vimmenu_T *menu, int hidden); void gui_mch_draw_menubar(void); void gui_mch_enable_scrollbar(scrollbar_T *sb, int flag); ! guicolor_T gui_mch_get_rgb(guicolor_T pixel); void gui_mch_getmouse(int *x, int *y); void gui_mch_setmouse(int x, int y); void gui_mch_mousehide(int hide); *** ../vim-7.4.2242/src/proto/gui_mac.pro 2016-07-07 16:42:57.318788362 +0200 --- src/proto/gui_mac.pro 2016-08-22 22:38:43.703884607 +0200 *************** *** 78,84 **** void gui_mch_menu_hidden(vimmenu_T *menu, int hidden); void gui_mch_draw_menubar(void); int gui_mch_get_lightness(guicolor_T pixel); ! long_u gui_mch_get_rgb(guicolor_T pixel); int gui_mch_get_mouse_x(void); int gui_mch_get_mouse_y(void); void gui_mch_setmouse(int x, int y); --- 78,84 ---- void gui_mch_menu_hidden(vimmenu_T *menu, int hidden); void gui_mch_draw_menubar(void); int gui_mch_get_lightness(guicolor_T pixel); ! guicolor_T gui_mch_get_rgb(guicolor_T pixel); int gui_mch_get_mouse_x(void); int gui_mch_get_mouse_y(void); void gui_mch_setmouse(int x, int y); *** ../vim-7.4.2242/src/proto/gui_photon.pro 2016-07-07 16:42:57.318788362 +0200 --- src/proto/gui_photon.pro 2016-08-22 22:38:55.995773812 +0200 *************** *** 25,31 **** void gui_mch_mousehide(int hide); void gui_mch_getmouse(int *x, int *y); void gui_mch_setmouse(int x, int y); ! long_u gui_mch_get_rgb(guicolor_T pixel); void gui_mch_new_colors(void); guicolor_T gui_mch_get_color(char_u *name); void gui_mch_set_fg_color(guicolor_T color); --- 25,31 ---- void gui_mch_mousehide(int hide); void gui_mch_getmouse(int *x, int *y); void gui_mch_setmouse(int x, int y); ! guicolor_T gui_mch_get_rgb(guicolor_T pixel); void gui_mch_new_colors(void); guicolor_T gui_mch_get_color(char_u *name); void gui_mch_set_fg_color(guicolor_T color); *** ../vim-7.4.2242/src/proto/gui_w32.pro 2016-07-07 16:42:57.322788302 +0200 --- src/proto/gui_w32.pro 2016-08-22 22:39:13.647614717 +0200 *************** *** 35,41 **** void gui_mch_set_menu_pos(int x, int y, int w, int h); void gui_mch_menu_hidden(vimmenu_T *menu, int hidden); void gui_mch_draw_menubar(void); ! long_u gui_mch_get_rgb(guicolor_T pixel); void gui_mch_activate_window(void); void gui_mch_show_toolbar(int showit); void gui_mch_show_tabline(int showit); --- 35,41 ---- void gui_mch_set_menu_pos(int x, int y, int w, int h); void gui_mch_menu_hidden(vimmenu_T *menu, int hidden); void gui_mch_draw_menubar(void); ! guicolor_T gui_mch_get_rgb(guicolor_T pixel); void gui_mch_activate_window(void); void gui_mch_show_toolbar(int showit); void gui_mch_show_tabline(int showit); *** ../vim-7.4.2242/src/proto/gui_x11.pro 2016-07-07 16:42:57.322788302 +0200 --- src/proto/gui_x11.pro 2016-08-22 22:39:18.787568394 +0200 *************** *** 24,30 **** GuiFontset gui_mch_get_fontset(char_u *name, int giveErrorIfMissing, int fixed_width); int fontset_height(XFontSet fs); int fontset_height2(XFontSet fs); ! guicolor_T gui_mch_get_color(char_u *reqname); void gui_mch_set_fg_color(guicolor_T color); void gui_mch_set_bg_color(guicolor_T color); void gui_mch_set_sp_color(guicolor_T color); --- 24,30 ---- GuiFontset gui_mch_get_fontset(char_u *name, int giveErrorIfMissing, int fixed_width); int fontset_height(XFontSet fs); int fontset_height2(XFontSet fs); ! guicolor_T gui_mch_get_color(char_u *name); void gui_mch_set_fg_color(guicolor_T color); void gui_mch_set_bg_color(guicolor_T color); void gui_mch_set_sp_color(guicolor_T color); *************** *** 58,64 **** void gui_mch_set_blinking(long waittime, long on, long off); void gui_mch_stop_blink(void); void gui_mch_start_blink(void); ! long_u gui_mch_get_rgb(guicolor_T pixel); void gui_x11_callbacks(Widget textArea, Widget vimForm); void gui_mch_getmouse(int *x, int *y); void gui_mch_setmouse(int x, int y); --- 58,64 ---- void gui_mch_set_blinking(long waittime, long on, long off); void gui_mch_stop_blink(void); void gui_mch_start_blink(void); ! guicolor_T gui_mch_get_rgb(guicolor_T pixel); void gui_x11_callbacks(Widget textArea, Widget vimForm); void gui_mch_getmouse(int *x, int *y); void gui_mch_setmouse(int x, int y); *** ../vim-7.4.2242/src/version.c 2016-08-22 22:47:42.407063402 +0200 --- src/version.c 2016-08-22 22:48:19.662734025 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2243, /**/ -- hundred-and-one symptoms of being an internet addict: 56. You leave the modem speaker on after connecting because you think it sounds like the ocean wind...the perfect soundtrack for "surfing the net". /// 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 ///