From 45510f4411c87555afb1e589a8cbc6d4d90c49eb Mon Sep 17 00:00:00 2001 From: "Jeremy Pallats/starcraft.man" Date: Mon, 7 Apr 2014 09:46:31 -0400 Subject: [PATCH] Revert changes not related to rtp --- README.md | 35 ++++++++-------- autoload/vundle.vim | 2 +- autoload/vundle/config.vim | 3 +- autoload/vundle/installer.vim | 2 +- doc/vundle.txt | 78 ++++++++++++++++------------------- test/vimrc | 9 +++- 6 files changed, 64 insertions(+), 65 deletions(-) diff --git a/README.md b/README.md index 776ae6f..95c5ec0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## [Help Maintain Vundle](https://github.com/gmarik/Vundle.vim/issues/383) +## [Help Maintain Vundle](https://github.com/gmarik/Vundle.vim/issues/241) ## About @@ -29,8 +29,7 @@ Installation requires [Git] and triggers [`git clone`] for each configured repository to `~/.vim/bundle/` by default. Curl is required for search. - If you are using Windows, go directly to [Windows setup]. If you run into any issues, please consult the [FAQ]. Also, - see the [Tips] wiki page for some additional options. + If you are using Windows, go directly to [Windows setup]. If you run into any issues, please consult the [FAQ]. 2. Set up [Vundle]: @@ -47,28 +46,30 @@ " set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/vundle/ call vundle#rc() - " alternatively, pass where Vundle should install plugins - "call vundle#rc('~/some/plugin/directory') + " alternatively, pass a path where Vundle should install plugins + "let path = '~/some/path/here' + "call vundle#rc(path) " 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 + " Keep Plugin commands between here and filetype plugin indent on. + " scripts on GitHub repos + Plugin 'tpope/vim-fugitive' + Plugin 'Lokaltog/vim-easymotion' + Plugin 'tpope/vim-rails.git' + " The sparkup vim script is in a subdirectory of this repo called vim. + " Pass the path to set the runtimepath properly. + Plugin 'rstacruz/sparkup', {'rtp': 'vim/'} + " scripts from http://vim-scripts.org/vim/scripts.html Plugin 'L9' - " plugins not on GitHub + Plugin 'FuzzyFinder' + " scripts not on GitHub Plugin 'git://git.wincent.com/command-t.git' " git repos on your local machine (i.e. when working on your own plugin) Plugin 'file:///home/gmarik/path/to/plugin' - " The sparkup vim script is in a subdirectory of this repo called vim. - " Pass the path to set the runtimepath properly. - Plugin 'rstacruz/sparkup', {'rtp': 'vim/'} - " Plugin will clone to the folder 'finder' inside `~/.vim/bundle`. - " Use to avoid plugin name collisions. - Plugin 'FuzzyFinder', {'name': 'finder'} + " ... filetype plugin indent on " required " To ignore plugin indent changes, instead use: @@ -81,6 +82,7 @@ " :PluginClean(!) - confirm (or auto-approve) removal of unused plugins " " see :h vundle for more details or wiki for FAQ + " NOTE: comments after Plugin commands are not allowed. " Put your stuff after this line ``` @@ -133,7 +135,6 @@ see [Vundle contributors](https://github.com/gmarik/vundle/graphs/contributors) [Vundle]:http://github.com/gmarik/vundle [Windows setup]:https://github.com/gmarik/vundle/wiki/Vundle-for-Windows [FAQ]:https://github.com/gmarik/vundle/wiki -[Tips]:https://github.com/gmarik/Vundle.vim/wiki/Tips-and-Tricks [Vim]:http://www.vim.org [Git]:http://git-scm.com [`git clone`]:http://gitref.org/creating/#clone diff --git a/autoload/vundle.vim b/autoload/vundle.vim index df922b7..d133237 100644 --- a/autoload/vundle.vim +++ b/autoload/vundle.vim @@ -30,7 +30,7 @@ com! -nargs=0 PluginDocs com! PluginUpdate PluginInstall! " Vundle Aliases -com! -nargs=? -bang -complete=custom,vundle#scripts#complete VundleInstall PluginList +com! -nargs=? -bang -complete=custom,vundle#scripts#complete VundleInstall PluginInstall com! -nargs=? -bang -complete=custom,vundle#scripts#complete VundleSearch PluginSearch com! -nargs=? -bang VundleClean PluginClean com! -nargs=0 VundleDocs PluginDocs diff --git a/autoload/vundle/config.vim b/autoload/vundle/config.vim index 1c611bc..7353520 100644 --- a/autoload/vundle/config.vim +++ b/autoload/vundle/config.vim @@ -70,7 +70,7 @@ func! s:rtp_add_defaults() let &rtp = current for item in reverse(split(default, ',')) exec 'set rtp-=' . item - if item =~ 'after$' + if fnamemodify(item, ":t") == 'after' exec 'set rtp+=' . item else exec 'set rtp^=' . item @@ -113,7 +113,6 @@ func! s:rtpath(opts) endf let s:bundle = {} -let s:lazy_bundles = [] func! s:bundle.path() return s:expand_path(g:bundle_dir.'/'.self.name) diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 7fdc5f3..bc2f41d 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -207,7 +207,7 @@ endf func! s:helptags(rtp) abort " it is important to keep trailing slash here - let doc_path = resolve(a:rtp).'/doc/' + let doc_path = resolve(a:rtp . '/doc/') call s:log(':helptags '.doc_path) try execute 'helptags ' . doc_path diff --git a/doc/vundle.txt b/doc/vundle.txt index f239938..a6c35e2 100644 --- a/doc/vundle.txt +++ b/doc/vundle.txt @@ -69,47 +69,41 @@ more information. Put this at the top of your `.vimrc` to use Vundle. Remove bundles you don't need, they are for illustration purposes. > - set nocompatible " be iMproved, required - filetype off " required - - " set the runtime path to include Vundle and initialize - set rtp+=~/.vim/bundle/vundle/ - call vundle#rc() - " alternatively, pass where Vundle should install plugins - "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 - Plugin 'L9' - " plugins not on GitHub - Plugin 'git://git.wincent.com/command-t.git' - " git repos on your local machine (i.e. when working on your own plugin) - Plugin 'file:///home/gmarik/path/to/plugin' - " The sparkup vim script is in a subdirectory of this repo called vim. - " Pass the path to set the runtimepath properly. - Plugin 'rstacruz/sparkup', {'rtp': 'vim/'} - " Plugin will clone to the folder 'finder' inside ~/.vim/bundle. - " Use to avoid plugin name collisions. - Plugin 'FuzzyFinder', {'name': 'finder'} - - filetype plugin indent on " required - " To ignore plugin indent changes, instead use: - "filetype plugin on - " - " Brief help - " :PluginList - list configured plugins - " :PluginInstall(!) - install (update) plugins - " :PluginSearch(!) foo - search (or refresh cache first) for foo - " :PluginClean(!) - confirm (or auto-approve) removal of unused plugins - " - " see :h vundle for more details or wiki for FAQ - " Put your stuff after this line + set nocompatible " be iMproved, required + filetype off " required + + " set the runtime path to include Vundle and initialize + set rtp+=~/.vim/bundle/vundle/ + call vundle#rc() + " alternatively, pass a path where Vundle should install bundles + "let path = '~/some/path/here' + "call vundle#rc(path) + + " let Vundle manage Vundle, required + Plugin 'gmarik/vundle' + + " The following are examples of different formats supported. + " Keep bundle commands between here and filetype plugin indent on. + " plugins on GitHub repos + Plugin 'tpope/vim-fugitive' + Plugin 'Lokaltog/vim-easymotion' + Plugin 'tpope/vim-rails.git' + " The sparkup vim script is in a subdirectory of this repo called vim. + " Pass the path to set the runtimepath properly. + Plugin 'rstacruz/sparkup', {'rtp': 'vim/'} + " plugins from http://vim-scripts.org/vim/scripts.html + Plugin 'L9' + Plugin 'FuzzyFinder' + " plugins not on GitHub + Plugin 'git://git.wincent.com/command-t.git' + " git repos on your local machine (i.e. when working on your own plugin) + Plugin 'file:///home/gmarik/path/to/plugin' + " ... + + filetype plugin indent on " required + " To ignore plugin indent changes, instead use: + "filetype plugin on + " Put your stuff after this line 4. Install configured bundles: @@ -208,7 +202,7 @@ The git protocol supports local installation using the 'file://' protocol. This is handy when developing plugins locally. Follow the protocol with an absolute path to the script directory. > - Plugin 'file///path/from/root/to/plugin' + Plugin 'file:///path/from/root/to/plugin' 3.3 INSTALLING PLUGINS ~ *vundle-plugins-install* *:PluginInstall* diff --git a/test/vimrc b/test/vimrc index 3fa5012..13dd2e2 100644 --- a/test/vimrc +++ b/test/vimrc @@ -1,10 +1,10 @@ " vim -u test/vimrc set nocompatible + set nowrap -filetype off -syntax on let bundle_dir = '/tmp/vundle-test/bundles/' +" let src = 'http://github.com/gmarik/vundle.git' " Vundle Options " let g:vundle_default_git_proto = 'git' @@ -12,12 +12,17 @@ let bundle_dir = '/tmp/vundle-test/bundles/' silent execute '!mkdir -p '.bundle_dir silent execute '!ln -f -s ~/.vim/bundle/vundle '.bundle_dir +filetype off +syntax on + runtime macros/matchit.vim " This test should be executed in "test" directory exec 'set rtp^='.bundle_dir.'vundle/' + call vundle#rc(bundle_dir) + Plugin 'molokai' " vim-scripts name " github username with dashes