aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Walch <florian@fwalch.com>2014-12-23 13:01:14 +0100
committerFlorian Walch <florian@fwalch.com>2014-12-23 21:23:49 +0100
commite06159e6ae907c50e2f36ad491297d23cb97487a (patch)
tree350e4bde4f87fa4345911ada7aa1ccc066ad0087
parent0b192bf990927657f6f4c6a4a4e406b38bbba01e (diff)
downloadrneovim-e06159e6ae907c50e2f36ad491297d23cb97487a.tar.gz
rneovim-e06159e6ae907c50e2f36ad491297d23cb97487a.tar.bz2
rneovim-e06159e6ae907c50e2f36ad491297d23cb97487a.zip
vim-patch:7.4.488
Problem: test_mapping fails for some people. Solution: Set the 'encoding' option. (Ken Takata) https://code.google.com/p/vim/source/detail?r=v7-4-488
-rw-r--r--src/nvim/version.c2
-rw-r--r--test/functional/legacy/mapping_spec.lua2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 473d4f8549..5542400e02 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -250,7 +250,7 @@ static int included_patches[] = {
491,
//490,
489,
- //488,
+ 488,
//487,
//486,
485,
diff --git a/test/functional/legacy/mapping_spec.lua b/test/functional/legacy/mapping_spec.lua
index 0cb270f701..46d29d1692 100644
--- a/test/functional/legacy/mapping_spec.lua
+++ b/test/functional/legacy/mapping_spec.lua
@@ -12,6 +12,8 @@ describe('mapping', function()
test starts here:
]])
+ execute('set encoding=utf-8')
+
-- Abbreviations with р (0x80) should work.
execute('inoreab чкпр vim')
feed('GAчкпр <cr><esc>')