From 463c782e8e2a9d12d39e85c5438482c75cab1498 Mon Sep 17 00:00:00 2001 From: Vahagn Khachatryan Date: Sun, 22 Apr 2018 12:27:58 +0100 Subject: [PATCH] Detecting vundle and configuring localvimrc --- vim/vimrc | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 442843f..042a143 100755 --- a/vim/vimrc +++ b/vim/vimrc @@ -397,24 +397,24 @@ nnoremap tl :tablast nnoremap tm :tabm nnoremap td :tabclose -" -" 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.