diff options
| author | Bram Moolenaar <bram@vim.org> | 2011-12-30 13:09:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2011-12-30 13:09:21 +0100 |
| commit | 2b99da290ee37f13e059ad08df46035f743094bc (patch) | |
| tree | a2186a9b41ef940b311ceae5358dde5b0e2a4987 | |
| parent | ca30a318a18d3a763ec96ee62aac3293d019554e (diff) | |
| download | vim-2b99da290ee37f13e059ad08df46035f743094bc.tar.gz | |
Problem: Test 83 may fail for some encodings.
Solution: Set 'encoding' to utf-8 earlier.
| -rw-r--r-- | src/testdir/test83.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test83.in b/src/testdir/test83.in index 09ef0b45..297d560d 100644 --- a/src/testdir/test83.in +++ b/src/testdir/test83.in @@ -2,12 +2,12 @@ Tests for tag search with !_TAG_FILE_ENCODING. STARTTEST :so mbyte.vim +:set enc=utf8 :if !has('iconv') || iconv("\x82\x60", "cp932", "utf-8") != "\uff21" : e! test.ok : w! test.out : qa! :endif -:set enc=utf8 :/^text for tags1$/,/^text for tags1$/+1w! Xtags1.txt :/^text for tags2$/,/^text for tags2$/+1w! Xtags2.txt diff --git a/src/version.c b/src/version.c index 3d2d47ab..50532c20 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 */ /**/ + 387, +/**/ 386, /**/ 385, |