vim: disable pymode_rope

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 231ebad8b0613b4b73338407ec91f316987fa0da..e1e5a291ae2b8c0c9980d98e5892454f221f7d38 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -28,7 +28,6 @@ Plugin 'scrooloose/syntastic'
 Plugin 'sirver/ultisnips'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'sirver/ultisnips'
 Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'

-Plugin 'tpope/vim-endwise'

 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
 Plugin 'tpope/vim-surround'


@@ -44,7 +43,9 @@ Plugin 'derekwyatt/vim-fswitch'
 " Plugin 'jalcine/cmake.vim'
 " Plugin 'powerman/vim-plugin-viewdoc'
 
 " Plugin 'jalcine/cmake.vim'
 " Plugin 'powerman/vim-plugin-viewdoc'
 

+" endwise needs to be after delimitmate

 Plugin 'raimondi/delimitmate'
 Plugin 'raimondi/delimitmate'

+Plugin 'tpope/vim-endwise'

 Plugin 'lokaltog/vim-easymotion'
 Plugin 'chrisbra/checkattach'
 Plugin 'klen/python-mode'
 Plugin 'lokaltog/vim-easymotion'
 Plugin 'chrisbra/checkattach'
 Plugin 'klen/python-mode'


@@ -393,6 +394,10 @@ let g:airline_powerline_fonts = 1
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'
 
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'
 

+" delimitmate {{{2
+let delimitMate_expand_cr = 2
+let g:delimitMate_expand_space = 1
+

 " fswitch {{{2
 nnoremap <silent> <Leader>ff :FSHere<CR>
 nnoremap <silent> <Leader>fl :FSRight<CR>
 " fswitch {{{2
 nnoremap <silent> <Leader>ff :FSHere<CR>
 nnoremap <silent> <Leader>fl :FSRight<CR>


@@ -433,6 +438,7 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTree
 " python-mode {{{2
 
 let g:pymode_rope_completion = 0
 " python-mode {{{2
 
 let g:pymode_rope_completion = 0

+let g:pymode_rope = 0

 let g:pymode_folding = 1
 
 " synastic {{{2
 let g:pymode_folding = 1
 
 " synastic {{{2