summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-12-23 14:56:28 +0100
committerBram Moolenaar <Bram@vim.org>2011-12-23 14:56:28 +0100
commitff0a4809e3a742cffb5bf441012c99d625363b24 (patch)
treeedc64e763b42723a31f98a705a6e11a4eabab2aa
parent637606413f3f67683a17286f1bb2d6ff01175dc8 (diff)
updated for version 7.3.386v7.3.386
Problem: Test 83 fails when iconv does not support cp932. (raf) Solution: Test if conversion works. (Yukihiro Nakadaira)
-rw-r--r--src/testdir/test83.in2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test83.in b/src/testdir/test83.in
index 300ddf1c78..09ef0b455f 100644
--- a/src/testdir/test83.in
+++ b/src/testdir/test83.in
@@ -2,7 +2,7 @@ Tests for tag search with !_TAG_FILE_ENCODING.
STARTTEST
:so mbyte.vim
-:if !has('iconv')
+:if !has('iconv') || iconv("\x82\x60", "cp932", "utf-8") != "\uff21"
: e! test.ok
: w! test.out
: qa!
diff --git a/src/version.c b/src/version.c
index 4e40bb3f7f..3d2d47ab7b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 386,
+/**/
385,
/**/
384,