aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShougo <Shougo.Matsu@gmail.com>2017-06-12 07:44:21 +0900
committerJustin M. Keyes <justinkz@gmail.com>2017-06-12 00:44:21 +0200
commit6650588c4a89616249e964631dad17a66e1c6592 (patch)
treee3d40af8dcb772bc97fae09879c88477d62be707
parent6eb2bcd1a02872433871cc53f525e90dc03fe4dd (diff)
downloadrneovim-6650588c4a89616249e964631dad17a66e1c6592.tar.gz
rneovim-6650588c4a89616249e964631dad17a66e1c6592.tar.bz2
rneovim-6650588c4a89616249e964631dad17a66e1c6592.zip
vim-patch:7.4.2190 (#6882)
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. https://github.com/vim/vim/commit/50fa8dd00c241fa0786fe92ecc02fee4e5d28e06
-rw-r--r--src/nvim/testdir/test_startup.vim2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_startup.vim b/src/nvim/testdir/test_startup.vim
index f78d92f3ff..5996b2cd4a 100644
--- a/src/nvim/testdir/test_startup.vim
+++ b/src/nvim/testdir/test_startup.vim
@@ -83,7 +83,7 @@ func Test_help_arg()
call add(found, "--version")
endif
endfor
- call assert_equal(['--version'], found)
+ call assert_equal(['Readonly mode', '--version'], found)
endif
call delete('Xtestout')
endfunc
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 70fbf3a9e6..c8300e786e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -254,7 +254,7 @@ static const int included_patches[] = {
// 2193 NA
// 2192 NA
// 2191 NA
- // 2190,
+ 2190,
// 2189,
2188,
2187,