summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-06-20 00:53:15 +0200
committerBram Moolenaar <Bram@vim.org>2011-06-20 00:53:15 +0200
commit67d441ba361fb60af9d46f74a23ba3e6c232244f (patch)
tree9f3bbe6eb0df93a55532662e3d3e836f1120b5e3
parent914968e66d54d9bc3e49aa376bfe136738e883e4 (diff)
downloadvim-git-67d441ba361fb60af9d46f74a23ba3e6c232244f.tar.gz
updated for version 7.3.229v7.3.229
Problem: Using fork() makes gvim crash on Mac when build with CoreFoundation. Solution: Disallow fork() when __APPLE__ is defined. (Hisashi T Fujinaka)
-rw-r--r--src/gui.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui.c b/src/gui.c
index 4255607a7..244dbd547 100644
--- 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 81ab3f7a6..702122180 100644
--- 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,