summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-04 23:20:23 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-04 23:20:23 +0200
commitd6ec1730bab0ef4a472637ffe5796d1351442308 (patch)
treeb2f8d3858fbcf2a06a74159be55f2ade06943574
parent58a7f87c8653b4cb5b0794b6b88e2ec140d3d2c3 (diff)
patch 8.1.1467: cscope test failsv8.1.1467
Problem: Cscope test fails. Solution: Update expected text.
-rw-r--r--src/testdir/test_cscope.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim
index 3b2abf5e1a..7795ac7af2 100644
--- a/src/testdir/test_cscope.vim
+++ b/src/testdir/test_cscope.vim
@@ -123,8 +123,8 @@ func Test_cscopeWithCscopeConnections()
if cs_version >= 15.8
for cmd in ['cs find a item', 'cs find 9 item']
let a = execute(cmd)
- call assert_equal(['', '(1 of 4): <<test_mf_hash>> item = LALLOC_CLEAR_ONE(mf_hashtab_T);'], split(a, '\n', 1))
- call assert_equal(' item = LALLOC_CLEAR_ONE(mf_hashtab_T);', getline('.'))
+ call assert_equal(['', '(1 of 4): <<test_mf_hash>> item = LALLOC_CLEAR_ONE(mf_hashitem_T);'], split(a, '\n', 1))
+ call assert_equal(' item = LALLOC_CLEAR_ONE(mf_hashitem_T);', getline('.'))
cnext
call assert_equal(' item = mf_hash_find(&ht, key);', getline('.'))
cnext
diff --git a/src/version.c b/src/version.c
index 7e64589640..de5e0abbb4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1467,
+/**/
1466,
/**/
1465,