pt/vundle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nin' of http://github.com/gmarik/vundle into nin

Browse Source
This commit is contained in:
gmarik 2011-08-24 16:18:03 -05:00
commit 5ae2d446f5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/vundle/installer.vim
View File

@ -4,7 +4,7 @@ func! vundle#installer#new(bang, ...) abort
\ map(copy(a:000), 'vundle#config#init_bundle(v:val, {})') \ map(copy(a:000), 'vundle#config#init_bundle(v:val, {})')
let names = vundle#scripts#bundle_names(map(copy(bundles), 'v:val.name_spec')) let names = vundle#scripts#bundle_names(map(copy(bundles), 'v:val.name_spec'))
call vundle#scripts#view('Installer',['" Installing bundles'], names + ['Helptags']) call vundle#scripts#view('Installer',['" Installing bundles to '.expand(g:bundle_dir)], names + ['Helptags'])
call s:process(a:bang, (a:bang ? 'I':'i')) call s:process(a:bang, (a:bang ? 'I':'i'))
@ -132,8 +132,8 @@ func! vundle#installer#clean(bang) abort
call vundle#scripts#view('clean', headers, names) call vundle#scripts#view('clean', headers, names)
redraw! redraw!
if (a:bang || empty(names) || input('Continute ? [ y/n ]:') =~? 'y') if (a:bang || empty(names) || input('Continue ? [ y/n ]:') =~? 'y')
call s:process(a:bang, 'd') call s:process(a:bang, 'D')
endif endif
endf endf

10
autoload/vundle/scripts.vim
View File

@ -23,8 +23,8 @@ func! vundle#scripts#complete(a,c,d)
endf endf
func! s:view_log() func! s:view_log()
if !exists('g:vundle_log_file') if !exists('g:vundle_log_file')
let g:vundle_log_file = expand('$HOME/.vim-vundle/vundle.log') let g:vundle_log_file = tempname()
endif endif
call writefile(g:vundle_log, g:vundle_log_file) call writefile(g:vundle_log, g:vundle_log_file)
@ -38,7 +38,7 @@ func vundle#scripts#bundle_names(names)
endf endf
func! vundle#scripts#view(title, headers, results) func! vundle#scripts#view(title, headers, results)
if exists('g:vundle_view') if exists('g:vundle_view') && bufloaded(g:vundle_view)
exec g:vundle_view.'bd!' exec g:vundle_view.'bd!'
endif endif
@ -69,7 +69,7 @@ func! vundle#scripts#view(title, headers, results)
com! -buffer -nargs=0 VundleLog call s:view_log() com! -buffer -nargs=0 VundleLog call s:view_log()
nnoremap <buffer> q :silent bd!<CR> nnoremap <buffer> q :silent bd!<CR>
nnoremap <buffer> d :exec 'Delete'.getline('.')<CR> nnoremap <buffer> D :exec 'Delete'.getline('.')<CR>
nnoremap <buffer> i :exec 'Install'.getline('.')<CR> nnoremap <buffer> i :exec 'Install'.getline('.')<CR>
nnoremap <buffer> I :exec 'Install'.substitute(getline('.'), '^Bundle ', 'Bundle! ', '')<CR> nnoremap <buffer> I :exec 'Install'.substitute(getline('.'), '^Bundle ', 'Bundle! ', '')<CR>
@ -115,7 +115,7 @@ func! s:fetch_scripts(to)
endf endf
func! s:load_scripts(bang) func! s:load_scripts(bang)
let f = expand('$HOME/.vim-vundle/vim-scripts.org.json') let f = expand(g:bundle_dir.'/.vundle/script-names.vim-scripts.org.json')
if a:bang || !filereadable(f) if a:bang || !filereadable(f)
if 0 != s:fetch_scripts(f) if 0 != s:fetch_scripts(f)
return [] return []