Merge remote branch 'dbox/master'

This commit is contained in:
gmarik 2011-03-28 22:03:36 -05:00
commit ae1749e69c
2 changed files with 9 additions and 4 deletions

View File

@ -8,10 +8,10 @@ func! vundle#installer#install(bang, ...)
redraw! redraw!
call vundle#config#require(bundles) call vundle#config#require(bundles)
call s:log("Installed bundles:\n".join((len(installed) == 0 ? ['no new bundless installed'] : map(installed, 'v:val.name')),"\n")) call s:log("Installed bundles:\n".join((empty(installed) ? ['no new bundless installed'] : map(installed, 'v:val.name')),"\n"))
let help_dirs = vundle#installer#helptags(bundles) let help_dirs = vundle#installer#helptags(bundles)
if len(help_dirs) > 0 if !empty(help_dirs)
call s:log('Helptags: done. '.len(help_dirs).' bundles processed') call s:log('Helptags: done. '.len(help_dirs).' bundles processed')
endif endif
endf endf
@ -45,7 +45,7 @@ endf
func! s:has_doc(rtp) func! s:has_doc(rtp)
return isdirectory(a:rtp.'/doc') return isdirectory(a:rtp.'/doc')
\ && (!filereadable(a:rtp.'/doc/tags') || filewritable(a:rtp.'/doc/tags')) \ && (!filereadable(a:rtp.'/doc/tags') || filewritable(a:rtp.'/doc/tags'))
\ && (len(glob(a:rtp.'/doc/*.txt')) > 0 || len(glob(a:rtp.'/doc/*.??x')) > 0) \ && !(empty(glob(a:rtp.'/doc/*.txt')) && empty(glob(a:rtp.'/doc/*.??x')))
endf endf
func! s:helptags(rtp) func! s:helptags(rtp)

View File

@ -25,7 +25,12 @@ func! vundle#scripts#complete(a,c,d)
endf endf
func! vundle#scripts#install() abort func! vundle#scripts#install() abort
let line = substitute(substitute(getline('.'), '\s*Bundle\s*','','g'), "'",'','g') let l = getline('.')
if l !~ '^Bundle '
echohl Error | echo 'Select Bundle to install'| echohl None
return 0
end
let line = substitute(substitute(l, '\s*Bundle\s*','','g'), "'",'','g')
call vundle#installer#install(0, line) call vundle#installer#install(0, line)
endf endf