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 aa86fc1df9543f292c08520858a76cb0fb5d3310..238fef3749e417cad29df138bcf9f296f23b6e57 100644 (file)
--- 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 a518d8641ded7dc78a72d16e1860376e421f16c7..548d611898ae03dd83197d30e921fdb4c5d85bf6 100644 (file)
--- 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,
 /**/