# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1308523995 -7200
# Node ID 07647a0545c9f0fad4e1e84062e0572a07d94659
# Parent  9b9e9cb768da1182176907eb99b02c687999eec6
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
--- a/src/gui.c
+++ b/src/gui.c
@@ -59,7 +59,8 @@ static int can_update_cursor = TRUE; /* 
 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
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    229,
+/**/
     228,
 /**/
     227,