From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 8 Dec 2011 14:57:59 +0000 (+0100)
Subject: updated for version 7.3.369
X-Git-Tag: v7.3.369
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4120a8964851b03a8fee7e15944ba7ef0bcb5a6;p=vim

updated for version 7.3.369
Problem:    When compiled with Gnome get an error message when using --help.
Solution:   Don't fork. (Ivan Krasilnikov)
---

diff --git a/src/main.c b/src/main.c
index 2044893df..d1702fe57 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3294,7 +3294,10 @@ usage()
 #ifdef FEAT_GUI_GNOME
     /* Gnome gives extra messages for --help if we continue, but not for -h. */
     if (gui.starting)
+    {
 	mch_msg("\n");
+	gui.dofork = FALSE;
+    }
     else
 #endif
 	mch_exit(0);
diff --git a/src/version.c b/src/version.c
index 2e1de9b09..af7461a35 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    369,
 /**/
     368,
 /**/