Simpler Gvsplit substitution, without register polluting

[dotfiles.git] / vim / .vimrc

diff --git a/vim/.vimrc b/vim/.vimrc
index 883546806d05a2e84b728ea427e5dac0b15d90e8..b4f525c4615edabd25cc8c8320a66e5ca2f88014 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -28,10 +28,11 @@ set backspace=indent,eol
 set shortmess=aoOtI
 set highlight-=v:Visual
 set highlight+=vr
+set highlight+=sr
 set cpoptions+=$
 set showcmd
 set showmatch
-set listchars=trail:·,tab:→→,nbsp:% ",eol:¶
+set listchars=trail:·,tab:>→,nbsp:% ",eol:¶
 set list
 
 set cursorline
@@ -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,15 +108,14 @@ 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>
 " }}}
 
 " *-lists indentation and formatting {{{
 set comments-=mb:*
 set formatlistpat=^\\s*\\*\ \\s*
-set formatoptions+=n
+set formatoptions+=onj
 " }}}
 
 " Spelling {{{
@@ -123,9 +123,9 @@ 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>
 " }}}
 
 " Often typos {{{
@@ -161,7 +161,6 @@ nmap <Tab> :buffers<CR>:buffer<Space>
 nmap <silent> <Home> :registers<CR>
 nmap <leader>' yiwciw"<C-r>""<ESC>
 nmap <leader>h1 yypVr=o
-nmap <leader>72 :set textwidth=72
 nmap <leader>sc 024i-<ESC>a >8 <ESC>24a-<ESC>
 nmap <leader><C-]> :vertical wincmd ]<CR>
 nnoremap <C-P> <C-I>