Skip to content

Commit

Permalink
update vital
Browse files Browse the repository at this point in the history
  • Loading branch information
haya14busa committed Oct 18, 2016
1 parent 5c6f3cd commit 1163245
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 15 deletions.
2 changes: 1 addition & 1 deletion autoload/EasyMotion/command_line.vim
Expand Up @@ -30,7 +30,7 @@ set cpo&vim
" }}}

" CommandLine:
let s:V = vital#easymotion#of()
let s:V = vital#easymotion#new()
let s:cmdline = s:V.import('Over.Commandline.Base')
let s:modules = s:V.import("Over.Commandline.Modules")
let s:search = s:cmdline.make()
Expand Down
2 changes: 1 addition & 1 deletion autoload/EasyMotion/overwin.vim
@@ -1,4 +1,4 @@
let s:V = vital#easymotion#of()
let s:V = vital#easymotion#new()
let s:HitAHintMotion = s:V.import('HitAHint.Motion')

call EasyMotion#init()
Expand Down
2 changes: 1 addition & 1 deletion autoload/vital/_easymotion.vim
@@ -1,5 +1,5 @@
let s:_plugin_name = expand('<sfile>:t:r')

function! vital#{s:_plugin_name}#new() abort
return vital#{s:_plugin_name[1:]}#of()
return vital#{s:_plugin_name[1:]}#new()
endfunction
Expand Up @@ -56,7 +56,7 @@ function! s:module.redraw(cmdline)
" https://github.com/osyo-manga/vital-over/issues/52
" https://github.com/Lokaltog/vim-easymotion/issues/177#issuecomment-53663431
if &cedit != "<C-c>"
\ ||(v:version >= 704 && has("patch441"))
\ ||(v:version > 704 || v:version == 704 && has("patch441"))
normal! :
else
execute "normal! :\<Esc>"
Expand Down
21 changes: 13 additions & 8 deletions autoload/vital/_easymotion/Prelude.vim
Expand Up @@ -16,22 +16,27 @@ endif
let s:save_cpo = &cpo
set cpo&vim

if v:version ># 703 ||
\ (v:version is 703 && has('patch465'))
if v:version > 703 ||
\ (v:version == 703 && has('patch465'))
function! s:glob(expr) abort
return glob(a:expr, 1, 1)
endfunction
else
function! s:glob(expr) abort
let R = glob(a:expr, 1)
return split(R, '\n')
return split(glob(a:expr, 1), '\n')
endfunction
endif

function! s:globpath(path, expr) abort
let R = globpath(a:path, a:expr, 1)
return split(R, '\n')
endfunction
if v:version > 704 ||
\ (v:version == 704 && has('patch279'))
function! s:globpath(path, expr) abort
return globpath(a:path, a:expr, 1, 1)
endfunction
else
function! s:globpath(path, expr) abort
return split(globpath(a:path, a:expr, 1), '\n')
endfunction
endif

" Wrapper functions for type().
let [
Expand Down
1 change: 1 addition & 0 deletions autoload/vital/_easymotion/Vim/Buffer.vim
Expand Up @@ -133,6 +133,7 @@ function! s:read_content(content, ...) abort
\)
finally
call delete(tempfile)
execute 'bwipeout!' tempfile
endtry
endfunction

Expand Down
4 changes: 2 additions & 2 deletions autoload/vital/easymotion.vim
Expand Up @@ -21,7 +21,7 @@ else
endfunction
endif

function! vital#{s:plugin_name}#of() abort
function! vital#{s:plugin_name}#new() abort
return s:new(s:plugin_name)
endfunction

Expand Down Expand Up @@ -170,7 +170,7 @@ function! s:_import(name) abort dict
let s:loaded[a:name] = export_module
if has_key(module, '_vital_loaded')
try
call module._vital_loaded(vital#{s:plugin_name}#of())
call module._vital_loaded(vital#{s:plugin_name}#new())
catch
unlet s:loaded[a:name]
throw 'vital: fail to call ._vital_loaded(): ' . v:exception
Expand Down
2 changes: 1 addition & 1 deletion autoload/vital/easymotion.vital
@@ -1,5 +1,5 @@
easymotion
64a8be0c1fbfbf944043fb22f16bab8c28756459
3404e200ca6b5f371811606e8399fefdf4595529

Over.Commandline.Base
Over.Commandline.Modules.Cancel
Expand Down

0 comments on commit 1163245

Please sign in to comment.