From 5cc1303a2d077911ded2f4da3c9ef16b86c9b7de Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Mon, 10 Feb 2014 08:32:01 +0100
Subject: [PATCH] multibyte: use `matchstr` instead of byte index

Ref: https://github.com/Lokaltog/vim-easymotion/issues/16
---
 autoload/EasyMotion.vim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/autoload/EasyMotion.vim b/autoload/EasyMotion.vim
index 3c6ef4b..aac915b 100644
--- a/autoload/EasyMotion.vim
+++ b/autoload/EasyMotion.vim
@@ -796,7 +796,8 @@ function! s:PromptUser(groups) "{{{
     if len(group_values) == 1
         if mode(1) ==# 'no'
             " Consider jump to first match
-            let s:dot_repeat['target'] = g:EasyMotion_keys[0]
+            " NOTE: matchstr() handles multibyte characters.
+            let s:dot_repeat['target'] = matchstr(g:EasyMotion_keys, '^.')
         endif
         redraw
         return group_values[0]
@@ -924,7 +925,8 @@ function! s:PromptUser(groups) "{{{
         " Jump first target when Enter or Space key is pressed "{{{
         if (char ==# "\<CR>" && g:EasyMotion_enter_jump_first == 1) ||
         \  (char ==# " " && g:EasyMotion_space_jump_first == 1)
-            let char = g:EasyMotion_keys[0]
+            " NOTE: matchstr() is multibyte aware.
+            let char = matchstr(g:EasyMotion_keys, '^.')
         endif "}}}
 
         " For dot repeat {{{