upgrade vim-plug
This commit is contained in:
@@ -28,6 +28,9 @@
|
|||||||
" " Using a non-master branch
|
" " Using a non-master branch
|
||||||
" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
|
" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' }
|
||||||
"
|
"
|
||||||
|
" " Using a tagged release; wildcard allowed (requires git 1.9.2 or above)
|
||||||
|
" Plug 'fatih/vim-go', { 'tag': '*' }
|
||||||
|
"
|
||||||
" " Plugin options
|
" " Plugin options
|
||||||
" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
|
" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
|
||||||
"
|
"
|
||||||
@@ -222,7 +225,9 @@ function! plug#end()
|
|||||||
if has_key(plug, 'for')
|
if has_key(plug, 'for')
|
||||||
let types = s:to_a(plug.for)
|
let types = s:to_a(plug.for)
|
||||||
if !empty(types)
|
if !empty(types)
|
||||||
|
augroup filetypedetect
|
||||||
call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim')
|
call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim')
|
||||||
|
augroup END
|
||||||
endif
|
endif
|
||||||
for type in types
|
for type in types
|
||||||
call s:assoc(lod.ft, type, name)
|
call s:assoc(lod.ft, type, name)
|
||||||
@@ -964,8 +969,17 @@ function! s:update_finish()
|
|||||||
call s:log4(name, 'Checking out '.spec.commit)
|
call s:log4(name, 'Checking out '.spec.commit)
|
||||||
let out = s:checkout(spec)
|
let out = s:checkout(spec)
|
||||||
elseif has_key(spec, 'tag')
|
elseif has_key(spec, 'tag')
|
||||||
call s:log4(name, 'Checking out '.spec.tag)
|
let tag = spec.tag
|
||||||
let out = s:system('git checkout -q '.s:esc(spec.tag).' 2>&1', spec.dir)
|
if tag =~ '\*'
|
||||||
|
let tags = s:lines(s:system('git tag --list '.string(tag).' --sort -version:refname 2>&1', spec.dir))
|
||||||
|
if !v:shell_error && !empty(tags)
|
||||||
|
let tag = tags[0]
|
||||||
|
call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag))
|
||||||
|
call append(3, '')
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
call s:log4(name, 'Checking out '.tag)
|
||||||
|
let out = s:system('git checkout -q '.s:esc(tag).' 2>&1', spec.dir)
|
||||||
else
|
else
|
||||||
let branch = s:esc(get(spec, 'branch', 'master'))
|
let branch = s:esc(get(spec, 'branch', 'master'))
|
||||||
call s:log4(name, 'Merging origin/'.branch)
|
call s:log4(name, 'Merging origin/'.branch)
|
||||||
@@ -2225,4 +2239,3 @@ endif
|
|||||||
|
|
||||||
let &cpo = s:cpo_save
|
let &cpo = s:cpo_save
|
||||||
unlet s:cpo_save
|
unlet s:cpo_save
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user