From e06159e6ae907c50e2f36ad491297d23cb97487a Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Tue, 23 Dec 2014 13:01:14 +0100
Subject: [PATCH] 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
---
 src/nvim/version.c                      | 2 +-
 test/functional/legacy/mapping_spec.lua | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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>')