Update vim to 8.0.0002

jjgod · Sep 12, 2016 · be4f02a · be4f02a
1 parent 32526c1
commit be4f02a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,11 +3,11 @@
 cmake_minimum_required(VERSION 2.6)
 project(VIM)
 
-set(VIMMAJOR 7)
-set(VIMMINOR 4)
-set(VIMPATCH 2156)
+set(VIMMAJOR 8)
+set(VIMMINOR 0)
+set(VIMPATCH 0002)
 set(VIM_VERSION       "${VIMMAJOR}.${VIMMINOR}.${VIMPATCH}")
-set(VIM_COCOA_VERSION "0.10")
+set(VIM_COCOA_VERSION "0.11")
 
 if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")

diff --git a/src/gui_mac.m b/src/gui_mac.m
@@ -1458,7 +1458,7 @@ int gui_mch_dialog(
 #define Green(c)    ((c & 0x0000FF00) >>  8)
 #define Blue(c)     ((c & 0x000000FF) >>  0)
 
-long_u gui_mch_get_rgb(guicolor_T pixel)
+guicolor_T gui_mch_get_rgb(guicolor_T pixel)
 {
     return (Red(pixel) << 16) + (Green(pixel) << 8) + Blue(pixel);
 }

diff --git a/src/proto/gui_cocoa.pro b/src/proto/gui_cocoa.pro
@@ -64,7 +64,7 @@ void gui_mch_menu_grey(vimmenu_T *menu, int grey);
 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);
+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);