patch 7.4.2190v7.4.2190

Problem:    When startup test fails it's not easy to find out why.
            GUI test fails with Gnome.
Solution:   Add the help entry matches to a list an assert that.
            Set $HOME for Gnome to create .gnome2 directory.

3 files changed, 16 insertions, 5 deletions

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
index d56015cea3..d95d991ebb 100644
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -9,6 +9,14 @@ func SetUp()
   if has("gui_kde")
     set guifont=Courier\ 10\ Pitch/8/-1/5/50/0/0/0/0/0
   endif
+
+  " Gnome insists on creating $HOME/.gnome2/..
+  call mkdir('Xhome')
+  let $HOME = fnamemodify('Xhome', ':p')
+endfunc
+
+func TearDown()
+  call delete('Xhome', 'rf')
 endfunc
 
 " Test for resetting "secure" flag after GUI has started.
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 0522ecc82e..8e3238ca1e 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -72,16 +72,17 @@ func Test_help_arg()
     call assert_match('Vi IMproved', lines[0])
 
     " check if  couple of lines are there
-    let found = 0
+    let found = []
     for line in lines
       if line =~ '-R.*Readonly mode'
-	let found += 1
+	call add(found, 'Readonly mode')
       endif
-      if line =~ '--version'
-	let found += 1
+      " Watch out for a second --version line in the Gnome version.
+      if line =~ '--version.*Print version information and exit'
+	call add(found, "--version")
       endif
     endfor
-    call assert_equal(2, found)
+    call assert_equal(['Readonly mode', '--version'], found)
   endif
   call delete('Xtestout')
 endfunc
diff --git a/src/version.c b/src/version.c
index 72ec3820a1..0ed07b4e8d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2190,
+/**/
     2189,
 /**/
     2188,