summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-05-21 13:05:15 +0200
committerBram Moolenaar <bram@vim.org>2013-05-21 13:05:15 +0200
commitc6fff47164c6d1f783156dd3ebfcca24f0f32337 (patch)
tree2300660651247ab9d5aed5a771d689497e8e182e
parent22beeaf8fbaaf3ac3e81f1632132bb866c686875 (diff)
downloadvim-c6fff47164c6d1f783156dd3ebfcca24f0f32337.tar.gz
updated for version 7.3.986v7.3.986v7-3-986
Problem: Test 95 doesn't pass when 'encoding' isn't utf-8. (Yasuhiro Matsumoto) Solution: Force 'encoding' to be utf-8.
-rw-r--r--src/testdir/test95.in3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test95.in b/src/testdir/test95.in
index fb78b88d..ed90bb7c 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 e74f2d1b..dd93e0a4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 986,
+/**/
985,
/**/
984,