diff options
| author | rover <pathfinder2013@126.com> | 2017-01-07 20:08:38 +0800 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-02-10 00:35:34 -0500 |
| commit | 971d0590be0e2981c9ce2fbdc2bb43150ad19869 (patch) | |
| tree | 56a0564fac99b616750663dbc6bbd9061203f798 /src | |
| parent | 40a306fe901132de2fbaf772c14727e24c68512d (diff) | |
| download | rneovim-971d0590be0e2981c9ce2fbdc2bb43150ad19869.tar.gz rneovim-971d0590be0e2981c9ce2fbdc2bb43150ad19869.tar.bz2 rneovim-971d0590be0e2981c9ce2fbdc2bb43150ad19869.zip | |
vim-patch:7.4.2295
Problem: Cscope test fails.
Solution: Avoid checking for specific line and column numbers.
https://github.com/vim/vim/commit/4792255eff03760dca0fd014616532e6d47db364
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_cscope.vim | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_cscope.vim b/src/nvim/testdir/test_cscope.vim index e9ed490372..4e78faa9fd 100644 --- a/src/nvim/testdir/test_cscope.vim +++ b/src/nvim/testdir/test_cscope.vim @@ -97,7 +97,7 @@ func Test_cscopeWithCscopeConnections() for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] enew let a=execute(cmd) - call assert_match('\n"Xmemfile_test.c" 143L, 3137C', a) + call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+C') call assert_equal('Xmemfile_test.c', @%) endfor @@ -105,7 +105,10 @@ func Test_cscopeWithCscopeConnections() for cmd in ['cs find i assert.h', 'cs find 8 assert.h'] enew let a=execute(cmd) - call assert_equal(['','"Xmemfile_test.c" 143L, 3137C','(1 of 1): <<global>> #include <assert.h>'], split(a, '\n', 1)) + let alines = split(a, '\n', 1) + call assert_equal('', alines[0]) + call assert_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+C') + call assert_equal('(1 of 1): <<global>> #include <assert.h>', alines[2]) call assert_equal('#include <assert.h>', getline('.')) endfor diff --git a/src/nvim/version.c b/src/nvim/version.c index e1999ecfd7..6188bec91f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -145,7 +145,7 @@ static int included_patches[] = { // 2298 NA // 2297 NA // 2296, - // 2295, + 2295, 2294, // 2293, // 2292, |