From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 21 Nov 2015 13:24:50 +0000 (+0100)
Subject: patch 7.4.931
X-Git-Tag: v7.4.931
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfcd1ddd103129b309671cba5cff55e19a9908e4;p=thirdparty%2Fvim.git

patch 7.4.931
Problem:    Test 94 fails on some systems.
Solution:   Set 'encoding' to utf-8.
---

diff --git a/src/testdir/test94.in b/src/testdir/test94.in
index aa86fc1df9..238fef3749 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 a518d8641d..548d611898 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    931,
 /**/
     930,
 /**/