diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-11-21 14:24:50 +0100 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2015-11-24 10:06:19 -0600 |
| commit | 56bbabc8ab402fc25d579a915650420ccc44c17d (patch) | |
| tree | 7007345c61ec541dbcee88070044248c54ad180e | |
| parent | 0a1cf9f794c739bab881ad9bcb7474d8806089b8 (diff) | |
| download | android_external_vim-56bbabc8ab402fc25d579a915650420ccc44c17d.tar.gz android_external_vim-56bbabc8ab402fc25d579a915650420ccc44c17d.tar.bz2 android_external_vim-56bbabc8ab402fc25d579a915650420ccc44c17d.zip | |
patch 7.4.931
Problem: Test 94 fails on some systems.
Solution: Set 'encoding' to utf-8.
| -rw-r--r-- | src/testdir/test94.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test94.in b/src/testdir/test94.in index aa86fc1df..238fef374 100644 --- a/src/testdir/test94.in +++ b/src/testdir/test94.in @@ -17,7 +17,7 @@ Test cases: STARTTEST :so small.vim -:set nocp viminfo+=nviminfo +:set enc=utf-8 nocp viminfo+=nviminfo : :" User functions :function MoveToCap() diff --git a/src/version.c b/src/version.c index a518d8641..548d61189 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 931, +/**/ 930, /**/ 929, |