summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-12-08 15:57:59 +0100
committerBram Moolenaar <Bram@vim.org>2011-12-08 15:57:59 +0100
commitf4120a8964851b03a8fee7e15944ba7ef0bcb5a6 (patch)
tree6c480c9c02d11fefb3b0f0b255ebded9649dc6a1
parentaeabe0545d5bcb6a89fad63078fb310f630b77fd (diff)
updated for version 7.3.369v7.3.369
Problem: When compiled with Gnome get an error message when using --help. Solution: Don't fork. (Ivan Krasilnikov)
-rw-r--r--src/main.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index 2044893df8..d1702fe570 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 2e1de9b09e..af7461a35e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 369,
+/**/
368,
/**/
367,