summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-10-22 22:09:01 +0200
committerBram Moolenaar <Bram@vim.org>2014-10-22 22:09:01 +0200
commit7a373dd0d49b3dd992e7999bb368d0b307d70662 (patch)
tree9ee1bef268a7214a0f0f7b416e2cdd9a5a8418e9 /src
parenta94618e16c2b55a351c172632873ad158c9b51db (diff)
downloadvim-git-7a373dd0d49b3dd992e7999bb368d0b307d70662.tar.gz
updated for version 7.4.488v7.4.488
Problem: test_mapping fails for some people. Solution: Set the 'encoding' option. (Ken Takata)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_mapping.in1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_mapping.in b/src/testdir/test_mapping.in
index 55dac09be..e2572772c 100644
--- a/src/testdir/test_mapping.in
+++ b/src/testdir/test_mapping.in
@@ -3,6 +3,7 @@ Test for mappings and abbreviations
STARTTEST
:so small.vim
:so mbyte.vim
+:set encoding=utf-8
: " abbreviations with р (0x80) should work
:inoreab чкпр vim
GAчкпр
diff --git a/src/version.c b/src/version.c
index b6f750cdc..e720782c7 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 */
/**/
+ 488,
+/**/
487,
/**/
486,