updated for version 7.3.986

Problem:    Test 95 doesn't pass when 'encoding' isn't utf-8. (Yasuhiro
            Matsumoto)
Solution:   Force 'encoding' to be utf-8.

diff --git a/src/testdir/test95.in b/src/testdir/test95.in
index fb78b88dd17dbc8e4d663f9a82de7b92f38147a2..ed90bb7c387b59ce3c53f594ec7a7ed29f34b9ec 100644 (file)
--- a/src/testdir/test95.in
+++ b/src/testdir/test95.in
@@ -1,4 +1,4 @@
-Test for regexp patterns with multi-byte support.
+Test for regexp patterns with multi-byte support, using utf-8.
 See test64 for the non-multi-byte tests.
 
 A pattern that gives the expected result produces OK, so that we know it was
@@ -7,6 +7,7 @@ actually tried.
 STARTTEST
 :so small.vim
 :so mbyte.vim
+:set encoding=utf-8 viminfo+=nviminfo
 :" tl is a List of Lists with:
 :"    regexp pattern
 :"    text to test the pattern on

diff --git a/src/version.c b/src/version.c
index e74f2d1b0544066952c1abb545ca56e40e0009d9..dd93e0a4327041044c7c9224102055ce89e90232 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    986,
 /**/
     985,
 /**/