updated for version 7.3.229

Problem:    Using fork() makes gvim crash on Mac when build with
            CoreFoundation.
Solution:   Disallow fork() when __APPLE__ is defined. (Hisashi T Fujinaka)

diff --git a/src/gui.c b/src/gui.c
index 4255607a72262d3758bbea599e64ca095503924f..244dbd547466f25a1f5bcf5fbef978152159bb68 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -59,7 +59,8 @@ static int can_update_cursor = TRUE; /* can display the cursor */
 gui_start()
 {
     char_u     *old_term;
-#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOS_X)
+#if defined(UNIX) && !defined(__BEOS__) && !defined(MACOS_X) \
+       && !defined(__APPLE__)
 # define MAY_FORK
     int                dofork = TRUE;
 #endif

diff --git a/src/version.c b/src/version.c
index 81ab3f7a674f2d41876fcfb5d19998af64e8ca53..7021221802f7f1963f90f79f7513a3a5b7103a8e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    229,
 /**/
     228,
 /**/