From f4120a8964851b03a8fee7e15944ba7ef0bcb5a6 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 8 Dec 2011 15:57:59 +0100 Subject: [PATCH] updated for version 7.3.369 Problem: When compiled with Gnome get an error message when using --help. Solution: Don't fork. (Ivan Krasilnikov) --- src/main.c | 3 +++ src/version.c | 2 ++ 2 files changed, 5 insertions(+) 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, /**/