Merge branch 'refactoring' into master

This commit is contained in:
haya14busa 2014-01-07 20:34:00 +09:00
commit 38b6f3b456
2 changed files with 966 additions and 979 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,37 +0,0 @@
" Saving 'cpoptions' {{{
let s:save_cpo = &cpo
set cpo&vim
" }}}
function! s:has_vimproc()
if !exists('s:exists_vimproc')
try
silent call vimproc#version()
let s:exists_vimproc = 1
catch
let s:exists_vimproc = 0
endtry
endif
return s:exists_vimproc
endfunction
function! EasyMotion#helper#system(...)
return call(s:has_vimproc() ? 'vimproc#system' : 'system', a:000)
endfunction
if exists('*strchars')
function! EasyMotion#helper#strchars(str)
return strchars(a:str)
endfunction
else
function! EasyMotion#helper#strchars(str)
return strlen(substitute(str, ".", "x", "g"))
endfunction
endif
function! EasyMotion#helper#include_multibyte_char(str)
return strlen(a:str) != EasyMotion#helper#strchars(a:str)
endfunction
" Restore 'cpoptions' {{{
let &cpo = s:save_cpo
unlet s:save_cpo
" }}}