X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/3bbbd1b402bb62889ad54c320d1e9e692fe323ee..a5cde7ec28f372d33c361960fc56e692e838ef5f:/vim/vimrc?ds=inline diff --git a/vim/vimrc b/vim/vimrc index abce751..db6f710 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -48,7 +48,12 @@ Plug 'klen/python-mode' Plug 'kshenoy/vim-signature' Plug 'majutsushi/tagbar' Plug 'octol/vim-cpp-enhanced-highlight' -Plug 'raimondi/delimitmate' +if !has('nvim') + Plug 'raimondi/delimitmate' " {{{2 + let delimitMate_expand_cr = 2 + let g:delimitMate_expand_space = 1 + "}}} +end Plug 'sgeb/vim-diff-fold' Plug 'skywind3000/asyncrun.vim' " {{{2 command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ @@ -676,9 +681,6 @@ nnoremap cl :CloseRightWindow nnoremap cj :CloseBelowWindow nnoremap ck :CloseAboveWindow -" delimitmate {{{2 -let delimitMate_expand_cr = 2 -let g:delimitMate_expand_space = 1 " fswitch {{{2 nnoremap ff :FSHere @@ -972,8 +974,6 @@ function! SwitchSpell() endfunction nnoremap coS :call SwitchSpell() -" fix spelling with first choice -nnoremap f 1z= " gitdir or home {{{2 " from derek wyatt: