From 3ed932e023e19a1c5bec5bb496a5c59ebb8c8436 Mon Sep 17 00:00:00 2001
From: Rykka <rykka10@gmail.com>
Date: Tue, 5 Jun 2012 01:10:14 +0800
Subject: [PATCH] 0

---
 README.md           | 25 +++++++------------------
 autoload/vundle.vim | 13 ++++++++++---
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 8f68f7b..7cd9bfa 100644
--- a/README.md
+++ b/README.md
@@ -60,39 +60,28 @@
 
     " only load once
     if !exists("g:vimrc_bundle_loaded")
+        let g:vimrc_bundle_loaded=1
         set nocompatible
         syntax on
         filetype off 
         
-        " set it to 1 then vundle will only adding the localbundle dir to &rtp.
+        " set it to 1 to enable it
+        " then vundle will only adding the localbundle dir to &rtp.
         let g:vundle_local = 1
-        " set the default localbundle directory
-        let g:vundle_local_dir = '~/.vim/localbundle'
-
-        if filereadable(expand(g:vundle_local_dir)."/autoload/vundle.vim")
-            exe 'set rtp^='.g:vundle_local_dir
-            exe 'set rtp+='.g:vundle_local_dir.'/after'
-        else
-            " make sure it's there
-            " otherwise clone it
-            " git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
-            set rtp+=~/.vim/bundle/vundle
-        endif
+        " set the localbundle directory
+        " let g:vundle_local_dir = '~/.vim/localbundle'
 
+        set rtp+=~/.vim/bundle/vundle
         call vundle#rc()
         Bundle 'gmarik/vundle'
 
-        Bundle 'majutsushi/tagbar'
-        Bundle 'sjl/gundo.vim'
-
         Bundle 'scrooloose/nerdtree'
-        Bundle 'scrooloose/syntastic'
+
         Bundle 'Rykka/colorv.vim'
         Bundle 'Rykka/galaxy.vim'
 
         " ...
         filetype plugin indent on     " required!
-        let g:vimrc_bundle_loaded=1
     endif "}}}
 
     ```
diff --git a/autoload/vundle.vim b/autoload/vundle.vim
index fba980a..6d2f30c 100644
--- a/autoload/vundle.vim
+++ b/autoload/vundle.vim
@@ -39,12 +39,19 @@ endif
 
 
 func! vundle#rc(...) abort
-  let g:vundle_local_dir = exists("g:vundle_local_dir") ? 
-              \ expand(g:vundle_local_dir) : expand('$HOME/.vim/localbundle', 1)
-  let g:vundle_local = exists("g:vundle_local") ? g:vundle_local : 0
   let g:bundle_dir = len(a:000) > 0 ? expand(a:1, 1) : expand('$HOME/.vim/bundle', 1)
   let g:updated_bundles = []
   let g:vundle_log = []
   let g:vundle_changelog = ['Updated Bundles:']
+
+  let g:vundle_local = exists("g:vundle_local") ? g:vundle_local : 0
+  let g:vundle_local_dir = exists("g:vundle_local_dir") ? 
+              \ expand(g:vundle_local_dir) : expand('$HOME/.vim/localbundle', 1)
+  if filereadable(g:vundle_local_dir."/autoload/vundle.vim") && g:vundle_local
+      exe 'set rtp^='.g:vundle_local_dir
+      exe 'set rtp+='.g:vundle_local_dir.'/after'
+      set rtp-=~/.vim/bundle/vundle
+  endif
+
   call vundle#config#init()
 endf