Let's remember about vimdiff in git

[dotfiles.git] / vim / .vimrc

diff --git a/vim/.vimrc b/vim/.vimrc
index 65870e15898dbb90e865f205f409cbd3e267f61d..b4f525c4615edabd25cc8c8320a66e5ca2f88014 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -28,6 +28,7 @@ set backspace=indent,eol
 set shortmess=aoOtI
 set highlight-=v:Visual
 set highlight+=vr
+set highlight+=sr
 set cpoptions+=$
 set showcmd
 set showmatch
@@ -79,7 +80,7 @@ set statusline+=%3*[%c%V:0x%B]
 set statusline+=%4*%{LintStatus()}
 set statusline+=%*\ %P
 
-function! LintStatus() " it is overrided in ftplugin/python/pylint.vim
+function! LintStatus() " it is overrided in ftplugins
     return ""
 endfunction
 " }}}
@@ -107,8 +108,7 @@ autocmd BufEnter * let &titlestring = expand("%:t")
 " }}}
 
 " Fugitive {{{
-let g:fugitive_git_executable = "LANG=en.UTF-8 git"
-nmap <F7> "cyiw:execute "Gvsplit " . @c<CR>zR
+nmap <F7> :Gvsplit <C-R><C-W><CR>zR
 nmap <F9> :diffupdate<CR>:syntax off<CR>:syntax on<CR>
 " }}}
 
@@ -123,11 +123,6 @@ set spelllang=ru,en_gb
 highlight SpellBad cterm=inverse ctermfg=red ctermbg=black
 " }}}
 
-" Netrw {{{
-let g:netrw_banner = 0
-let g:netrw_bufsettings = "noma nomod nowrap ro nobl"
-" }}}
-
 " Unimpaired-like textwidth switching {{{
 nmap [ob :set textwidth=72<CR>
 nmap ]ob :set textwidth=0<CR>