summaryrefslogtreecommitdiff
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
commit25b46186ceb3801196b7dac7b7d1cc01c907f0df (patch)
treeceadfa469e60da371eb63f9859d8e5a55adeeba0
parentce90a11528b2ef7bc8157d5880cfb3fe14a2e04f (diff)
downloadvim-25b46186ceb3801196b7dac7b7d1cc01c907f0df.tar.gz
updated for version 7.3.369v7.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 2044893d..d1702fe5 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 2e1de9b0..af7461a3 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,