From e1e2c64caa9af4da5748c5dc5acd8f3acb983571 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 20 Aug 2011 19:34:52 -0500 Subject: [PATCH 1/7] Improve message - show installation destination --- autoload/vundle/installer.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 2b69153..dfd8096 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -4,7 +4,7 @@ func! vundle#installer#new(bang, ...) abort \ map(copy(a:000), 'vundle#config#init_bundle(v:val, {})') 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')) From 06480ede43ca028f747f970f0c1a50b12b515090 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 20 Aug 2011 19:53:34 -0500 Subject: [PATCH 2/7] delete buffer if it loaded - to avod error when deleting nonexisting buffer --- autoload/vundle/scripts.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 0200a03..76a73f5 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -38,7 +38,7 @@ func vundle#scripts#bundle_names(names) endf 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!' endif From 3f4ed10b55cabbccb96662cf45f6319da03379da Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 20 Aug 2011 20:11:49 -0500 Subject: [PATCH 3/7] log file is a tempfile - not sure if there's a need for log file in predefined location - installer is verbose enough to signal errors --- autoload/vundle/scripts.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 76a73f5..4f5f357 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -23,8 +23,8 @@ func! vundle#scripts#complete(a,c,d) endf func! s:view_log() - if !exists('g:vundle_log_file') - let g:vundle_log_file = expand('$HOME/.vim-vundle/vundle.log') + if !exists('g:vundle_log_file') + let g:vundle_log_file = tempname() endif call writefile(g:vundle_log, g:vundle_log_file) From 22b86e2979c40ca154994a8624c7c7b2dc75d1fa Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 20 Aug 2011 20:17:57 -0500 Subject: [PATCH 4/7] g:bundle_dir/.vundle is a storage dir now - do not clutter up ~/ --- autoload/vundle/scripts.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 4f5f357..1b56d64 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -115,7 +115,7 @@ func! s:fetch_scripts(to) endf func! s:load_scripts(bang) - let f = expand('$HOME/.vim-vundle/vim-scripts.org.json') + let f = expand(g:bundle_dir.'/.vundle/vim-scripts.org.json') if a:bang || !filereadable(f) if 0 != s:fetch_scripts(f) return [] From 2506ac3c67eb9788951539118d3694367ebcc865 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sat, 20 Aug 2011 20:19:45 -0500 Subject: [PATCH 5/7] rename storage file - so it better reflects the content --- autoload/vundle/scripts.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 1b56d64..3f603d4 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -115,7 +115,7 @@ func! s:fetch_scripts(to) endf func! s:load_scripts(bang) - let f = expand(g:bundle_dir.'/.vundle/vim-scripts.org.json') + let f = expand(g:bundle_dir.'/.vundle/script-names.vim-scripts.org.json') if a:bang || !filereadable(f) if 0 != s:fetch_scripts(f) return [] From 17b4a11588f15b1b89918525633595ec0d7ca172 Mon Sep 17 00:00:00 2001 From: gmarik Date: Sun, 21 Aug 2011 15:18:18 -0500 Subject: [PATCH 6/7] Fix spelling --- autoload/vundle/installer.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index dfd8096..6cd4633 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -132,7 +132,7 @@ func! vundle#installer#clean(bang) abort call vundle#scripts#view('clean', headers, names) 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') endif endf From b571067525a83432911ba0a321c0e8dc1930be17 Mon Sep 17 00:00:00 2001 From: gmarik Date: Mon, 22 Aug 2011 18:56:42 -0500 Subject: [PATCH 7/7] use capital D to map delete cmd - to avoid accidental removal --- autoload/vundle/installer.vim | 2 +- autoload/vundle/scripts.vim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 6cd4633..7f84fb5 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -133,7 +133,7 @@ func! vundle#installer#clean(bang) abort redraw! if (a:bang || empty(names) || input('Continue ? [ y/n ]:') =~? 'y') - call s:process(a:bang, 'd') + call s:process(a:bang, 'D') endif endf diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 3f603d4..e856299 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -69,7 +69,7 @@ func! vundle#scripts#view(title, headers, results) com! -buffer -nargs=0 VundleLog call s:view_log() nnoremap q :silent bd! - nnoremap d :exec 'Delete'.getline('.') + nnoremap D :exec 'Delete'.getline('.') nnoremap i :exec 'Install'.getline('.') nnoremap I :exec 'Install'.substitute(getline('.'), '^Bundle ', 'Bundle! ', '')