diff --git a/src/os_macosx.m b/src/os_macosx.m index 029f103b1a..6fd72fd280 100644 --- a/src/os_macosx.m +++ b/src/os_macosx.m @@ -14,7 +14,6 @@ /* Avoid a conflict for the definition of Boolean between Mac header files and * X11 header files. */ #define NO_X11_INCLUDES -#define BalloonEval int /* used in header files */ #include "vim.h" #import diff --git a/src/version.c b/src/version.c index 202d21d3b3..163ae8e34a 100644 --- a/src/version.c +++ b/src/version.c @@ -771,6 +771,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1315, /**/ 1314, /**/