summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_cscope.vim7
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim
index e9ed490372..4e78faa9fd 100644
--- a/src/testdir/test_cscope.vim
+++ b/src/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/version.c b/src/version.c
index d881342b1e..f0f9c827fb 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 */
/**/
+ 2295,
+/**/
2294,
/**/
2293,