summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-03-07 14:50:34 +0100
committerBram Moolenaar <bram@vim.org>2013-03-07 14:50:34 +0100
commitedf63a3b22a52e457b488576cff63fba3133fe25 (patch)
treecbbbfd32d2b63cab7ad58ed388ebd01966a6baa8
parent81c836daedc0daebc5ae8468d1347bfcf82a5170 (diff)
downloadvim-edf63a3b22a52e457b488576cff63fba3133fe25.tar.gz
updated for version 7.3.847v7.3.847v7-3-847
Problem: Test 55 fails when messages are translated. Solution: Set language to C. (Ken Takata)
-rw-r--r--src/testdir/test55.in1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test55.in b/src/testdir/test55.in
index f255e33e..991c4605 100644
--- a/src/testdir/test55.in
+++ b/src/testdir/test55.in
@@ -3,6 +3,7 @@ Tests for List and Dictionary types. vim: set ft=vim :
STARTTEST
:so small.vim
:fun Test(...)
+:lang C
:" Creating List directly with different types
:let l = [1, 'as''d', [1, 2, function("strlen")], {'a': 1},]
:$put =string(l)
diff --git a/src/version.c b/src/version.c
index 7db09124..309f656c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 847,
+/**/
846,
/**/
845,