Skip to content

Commit 1163245

Browse files
committed
update vital
1 parent 5c6f3cd commit 1163245

File tree

8 files changed

+21
-15
lines changed

8 files changed

+21
-15
lines changed

autoload/EasyMotion/command_line.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ set cpo&vim
3030
" }}}
3131

3232
" CommandLine:
33-
let s:V = vital#easymotion#of()
33+
let s:V = vital#easymotion#new()
3434
let s:cmdline = s:V.import('Over.Commandline.Base')
3535
let s:modules = s:V.import("Over.Commandline.Modules")
3636
let s:search = s:cmdline.make()

autoload/EasyMotion/overwin.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
let s:V = vital#easymotion#of()
1+
let s:V = vital#easymotion#new()
22
let s:HitAHintMotion = s:V.import('HitAHint.Motion')
33

44
call EasyMotion#init()

autoload/vital/_easymotion.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let s:_plugin_name = expand('<sfile>:t:r')
22

33
function! vital#{s:_plugin_name}#new() abort
4-
return vital#{s:_plugin_name[1:]}#of()
4+
return vital#{s:_plugin_name[1:]}#new()
55
endfunction

autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function! s:module.redraw(cmdline)
5656
" https://github.com/osyo-manga/vital-over/issues/52
5757
" https://github.com/Lokaltog/vim-easymotion/issues/177#issuecomment-53663431
5858
if &cedit != "<C-c>"
59-
\ ||(v:version >= 704 && has("patch441"))
59+
\ ||(v:version > 704 || v:version == 704 && has("patch441"))
6060
normal! :
6161
else
6262
execute "normal! :\<Esc>"

autoload/vital/_easymotion/Prelude.vim

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,27 @@ endif
1616
let s:save_cpo = &cpo
1717
set cpo&vim
1818

19-
if v:version ># 703 ||
20-
\ (v:version is 703 && has('patch465'))
19+
if v:version > 703 ||
20+
\ (v:version == 703 && has('patch465'))
2121
function! s:glob(expr) abort
2222
return glob(a:expr, 1, 1)
2323
endfunction
2424
else
2525
function! s:glob(expr) abort
26-
let R = glob(a:expr, 1)
27-
return split(R, '\n')
26+
return split(glob(a:expr, 1), '\n')
2827
endfunction
2928
endif
3029

31-
function! s:globpath(path, expr) abort
32-
let R = globpath(a:path, a:expr, 1)
33-
return split(R, '\n')
34-
endfunction
30+
if v:version > 704 ||
31+
\ (v:version == 704 && has('patch279'))
32+
function! s:globpath(path, expr) abort
33+
return globpath(a:path, a:expr, 1, 1)
34+
endfunction
35+
else
36+
function! s:globpath(path, expr) abort
37+
return split(globpath(a:path, a:expr, 1), '\n')
38+
endfunction
39+
endif
3540

3641
" Wrapper functions for type().
3742
let [

autoload/vital/_easymotion/Vim/Buffer.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ function! s:read_content(content, ...) abort
133133
\)
134134
finally
135135
call delete(tempfile)
136+
execute 'bwipeout!' tempfile
136137
endtry
137138
endfunction
138139

autoload/vital/easymotion.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ else
2121
endfunction
2222
endif
2323

24-
function! vital#{s:plugin_name}#of() abort
24+
function! vital#{s:plugin_name}#new() abort
2525
return s:new(s:plugin_name)
2626
endfunction
2727

@@ -170,7 +170,7 @@ function! s:_import(name) abort dict
170170
let s:loaded[a:name] = export_module
171171
if has_key(module, '_vital_loaded')
172172
try
173-
call module._vital_loaded(vital#{s:plugin_name}#of())
173+
call module._vital_loaded(vital#{s:plugin_name}#new())
174174
catch
175175
unlet s:loaded[a:name]
176176
throw 'vital: fail to call ._vital_loaded(): ' . v:exception

autoload/vital/easymotion.vital

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
easymotion
2-
64a8be0c1fbfbf944043fb22f16bab8c28756459
2+
3404e200ca6b5f371811606e8399fefdf4595529
33

44
Over.Commandline.Base
55
Over.Commandline.Modules.Cancel

0 commit comments

Comments
 (0)