Skip to content

Commit

Permalink
Merge remote branch 'dbox/nin' into nin
Browse files Browse the repository at this point in the history
  • Loading branch information
gmarik committed Aug 18, 2011
2 parents 1874255 + 5c06a28 commit d71770d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions autoload/vundle.vim
Expand Up @@ -37,5 +37,6 @@ endif

func! vundle#rc(...) abort
let g:bundle_dir = len(a:000) > 0 ? expand(a:1) : expand('$HOME/.vim/bundle')
let g:vundle_log = []
call vundle#config#init()
endf
1 change: 0 additions & 1 deletion autoload/vundle/installer.vim
Expand Up @@ -193,7 +193,6 @@ func! s:system(cmd) abort
endf

func! s:log(str) abort
if !exists('g:vundle_log') | let g:vundle_log = [] | endif
call add(g:vundle_log, a:str)
return a:str
endf
9 changes: 6 additions & 3 deletions autoload/vundle/scripts.vim
Expand Up @@ -23,9 +23,12 @@ func! vundle#scripts#complete(a,c,d)
endf

func! s:view_log()
if !exists('b:log_file') | let b:log_file = tempname() | endif
call writefile(g:vundle_log, b:log_file)
silent pedit `=b:log_file`
if !exists('g:vundle_log_file')
let g:vundle_log_file = expand('$HOME/.vim-vundle/vundle.log')
endif

call writefile(g:vundle_log, g:vundle_log_file)
silent pedit `=g:vundle_log_file`

wincmd P | wincmd H
endf
Expand Down

0 comments on commit d71770d

Please sign in to comment.