Detecting vundle and configuring localvimrc

vim/vimrc

@@ -397,24 +397,24 @@ nnoremap tl  :tablast<CR>
 nnoremap tm  :tabm<Space>
 nnoremap td  :tabclose<CR>
 
-"
-" Locate and load .vimrc.local from curent directory.
-"
-if !exists('*LocalVimrcLoad')
-    runtime plugin/local-vimrc.vim
-endif
-call LocalVimrcLoad( getcwd() )
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "   Plugins
 "
 
 "
-" Vundle experimental stuff here.
+"  Detect Vundle
 "
-if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
+let s:vundle_path = '~/.vim/bundle/Vundle.vim'
+if filereadable(expand('C:/devel/scripts/vim/bundle/Vundle.vim/README.md'))
+    let s:vundle_path = 'C:/devel/scripts/vim/bundle/Vundle.vim'
+endif
+
+"
+" Vundle stuff here.
+"
+if filereadable(expand(s:vundle_path.'/README.md'))
     filetype off
-    set rtp+=~/.vim/bundle/Vundle.vim
+    let &rtp=&rtp.','.s:vundle_path
     call vundle#begin()
     Plugin 'VundleVim/Vundle.vim'
 
@@ -511,6 +511,8 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     "   Local vimrc
     "
     Plugin 'embear/vim-localvimrc'
+    let g:localvimrc_name = [ ".vimrc.local" ]
+    let g:localvimrc_ask = 0
 
     "
     "   Comment code.