summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-04 22:21:21 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-04 22:21:21 +0100
commitad7dac85c3c90893e78e5463ca44b874082b482f (patch)
tree0942b7a576b6c37ac071813a9e958a9abe6dfb09
parentc3632516303842244442f354734e54a403ec4b50 (diff)
downloadvim-git-ad7dac85c3c90893e78e5463ca44b874082b482f.tar.gz
patch 8.0.1265: swap test not skipped when there is one groupv8.0.1265
Problem: Swap test not skipped when there is one group. Solution: Convert list to string for the message.
-rw-r--r--src/testdir/test_swap.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index d11c124d0..457edf685 100644
--- a/src/testdir/test_swap.vim
+++ b/src/testdir/test_swap.vim
@@ -53,7 +53,7 @@ func Test_swap_group()
endif
let groups = split(system('groups'))
if len(groups) <= 1
- throw 'Skipped: need at least two groups, got ' . groups
+ throw 'Skipped: need at least two groups, got ' . string(groups)
endif
call delete('Xtest')
diff --git a/src/version.c b/src/version.c
index e83549c98..78b58115d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1265,
+/**/
1264,
/**/
1263,