From b8e8166d61b8858d839b16f66dc6c941f93793ca Mon Sep 17 00:00:00 2001 From: "Jeremy Pallats/starcraft.man" Date: Sun, 6 Apr 2014 17:04:39 -0400 Subject: [PATCH] Undoing delayed init, seems like a dead end for speedup. --- README.md | 7 +++---- autoload/vundle.vim | 10 ---------- autoload/vundle/config.vim | 15 --------------- doc/vundle.txt | 7 +++---- test/vimrc | 3 +-- 5 files changed, 7 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index fcfd2ce..776ae6f 100644 --- a/README.md +++ b/README.md @@ -46,14 +46,15 @@ " set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/vundle/ - call vundle#begin() + call vundle#rc() " alternatively, pass where Vundle should install plugins - "call vundle#begin('~/some/plugin/directory') + "call vundle#rc('~/some/plugin/directory') " let Vundle manage Vundle, required Plugin 'gmarik/vundle' " The following are examples of different formats supported. + " Plugins are available for use after the Plugin command returns. " plugins on GitHub repos Plugin 'tpope/vim-fugitive' "A plugin for git integration " plugins from http://vim-scripts.org/vim/scripts.html @@ -69,8 +70,6 @@ " Use to avoid plugin name collisions. Plugin 'FuzzyFinder', {'name': 'finder'} - " Plugins available after vundle#end() finishes. - call vundle#end() filetype plugin indent on " required " To ignore plugin indent changes, instead use: "filetype plugin on diff --git a/autoload/vundle.vim b/autoload/vundle.vim index a17e19a..df922b7 100644 --- a/autoload/vundle.vim +++ b/autoload/vundle.vim @@ -56,16 +56,6 @@ sign define Vu_deleted text=- texthl=Comment sign define Vu_helptags text=* texthl=Comment endif -func! vundle#begin(...) abort - call call('vundle#rc', a:000) - com! -nargs=+ -bar Plugin call vundle#config#bundle_lazy() -endf - -func! vundle#end(...) abort - call vundle#config#activate_all_plugins() - com! -nargs=+ -bar Plugin call vundle#config#bundle() -endf - func! vundle#rc(...) abort let g:bundle_dir = len(a:000) > 0 ? expand(a:1, 1) : expand('$HOME/.vim/bundle', 1) let g:bundles = [] diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index 8a19186..1c611bc 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -7,21 +7,6 @@ func! vundle#config#bundle(arg, ...) return bundle endf -" Add a plugin to be initialized later. -" -" arg -- a string specifying the plugin -" ... -- a dictionary of options for the plugin -func! vundle#config#bundle_lazy(arg, ...) - call add(s:lazy_bundles, [a:arg, a:000]) -endf - -" Add all plugins in s:lazy_bundles to the runtimepath. -func! vundle#config#activate_all_plugins() - call extend(g:bundles, map(s:lazy_bundles, 'vundle#config#init_bundle(v:val[0], v:val[1])')) - call s:rtp_add_a() - call s:rtp_add_defaults() -endf - func! vundle#config#require(bundles) abort for b in a:bundles call s:rtp_add(b.rtpath) diff --git a/doc/vundle.txt b/doc/vundle.txt index ac67e45..f239938 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -74,14 +74,15 @@ more information. " set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/vundle/ - call vundle#begin() + call vundle#rc() " alternatively, pass where Vundle should install plugins - "call vundle#begin('~/some/plugin/directory') + "call vundle#rc('~/some/plugin/directory') " let Vundle manage Vundle, required Plugin 'gmarik/vundle' " The following are examples of different formats supported. + " Plugins are available for use after the Plugin command returns. " plugins on GitHub repos Plugin 'tpope/vim-fugitive' "A plugin for git integration " plugins from http://vim-scripts.org/vim/scripts.html @@ -97,8 +98,6 @@ more information. " Use to avoid plugin name collisions. Plugin 'FuzzyFinder', {'name': 'finder'} - " Plugins available after vundle#end() finishes. - call vundle#end() filetype plugin indent on " required " To ignore plugin indent changes, instead use: "filetype plugin on diff --git a/test/vimrc b/test/vimrc index 1c613e9..3fa5012 100644 --- a/test/vimrc +++ b/test/vimrc @@ -16,7 +16,7 @@ runtime macros/matchit.vim " This test should be executed in "test" directory exec 'set rtp^='.bundle_dir.'vundle/' -call vundle#begin(bundle_dir) +call vundle#rc(bundle_dir) Plugin 'molokai' " vim-scripts name @@ -53,7 +53,6 @@ Bundle 'vim-scripts/RubySinatra' " syntax issue #203 Bundle 'jimenezrick/vimerl' -call vundle#end() filetype plugin indent on " Automatically detect file types. set wildignore+=doc " should not break helptags