summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_cscope.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim
index d29949c4e..37ef1db68 100644
--- a/src/testdir/test_cscope.vim
+++ b/src/testdir/test_cscope.vim
@@ -243,7 +243,8 @@ func Test_cscopeWithCscopeConnections()
" Test: 'csprg' option
" Skip this with valgrind, it causes spurious leak reports
- if !RunningWithValgrind()
+ " FIXME: this causes failures when timers are used
+ if !RunningWithValgrind() && 0
call assert_equal('cscope', &csprg)
set csprg=doesnotexist
call assert_fails('cscope add Xcscope2.out', 'E262:')
diff --git a/src/version.c b/src/version.c
index 325652418..386babf5c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 565,
+/**/
564,
/**/
563,