From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 21 May 2013 11:05:15 +0000 (+0200)
Subject: updated for version 7.3.986
X-Git-Tag: v7.3.986
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7a06b1d7134792df3527babe3bbcb38415b1ee9;p=vim

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 fb78b88dd..ed90bb7c3 100644
--- 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 e74f2d1b0..dd93e0a43 100644
--- 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,
 /**/