summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-21 14:24:50 +0100
committerBram Moolenaar <Bram@vim.org>2015-11-21 14:24:50 +0100
commitcfcd1ddd103129b309671cba5cff55e19a9908e4 (patch)
treed7524c6b5499108e2596b3df5dfe89fd165bca33
parente392eb41f8dfc01bd13634e534ac6b4d505326f4 (diff)
downloadvim-git-cfcd1ddd103129b309671cba5cff55e19a9908e4.tar.gz
patch 7.4.931v7.4.931
Problem: Test 94 fails on some systems. Solution: Set 'encoding' to utf-8.
-rw-r--r--src/testdir/test94.in2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test94.in b/src/testdir/test94.in
index aa86fc1df..238fef374 100644
--- a/src/testdir/test94.in
+++ b/src/testdir/test94.in
@@ -17,7 +17,7 @@ Test cases:
STARTTEST
:so small.vim
-:set nocp viminfo+=nviminfo
+:set enc=utf-8 nocp viminfo+=nviminfo
:
:" User functions
:function MoveToCap()
diff --git a/src/version.c b/src/version.c
index a518d8641..548d61189 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 931,
+/**/
930,
/**/
929,