X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=883546806d05a2e84b728ea427e5dac0b15d90e8;hb=79f661b818492cef93553bcb766402ae7835216d;hp=af68bd1bf9a6bd6f39aa010bd03e63e922e5f548;hpb=df3d205ae088266da2add01a9d2cab13eb8cb7d1;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index af68bd1..8835468 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -38,7 +38,7 @@ set cursorline
 set cursorcolumn
 set colorcolumn=80
 highlight ExtraWhitespace ctermbg=green ctermfg=blue
-match ExtraWhitespace /^\s*$/
+match ExtraWhitespace /\s\+$/
 
 set relativenumber
 set numberwidth=3
@@ -103,6 +103,7 @@ autocmd VimResized * wincmd =
 " Tmux window naming {{{
 set titleold = ""
 set title
+autocmd BufEnter * let &titlestring = expand("%:t")
 " }}}
 
 " Fugitive {{{
@@ -117,16 +118,27 @@ set formatlistpat=^\\s*\\*\ \\s*
 set formatoptions+=n
 " }}}
 
-autocmd BufEnter * let &titlestring = expand("%:t")
-
-set keywordprg=
+" Spelling {{{
+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"
+" }}}
 
-" Often typos
+" Often typos {{{
 map q: :
 command! W w
+nmap <F1> :help!<CR>
+imap <F1> <C-O>:help!<CR>
+iabbrev итд и т.д.
+iabbrev итп и т.п.
+" }}}
+
+set keywordprg=
+let g:sh_no_error = 1
 
 nmap <space> f<space>
 vmap <space> I<space><ESC>gv
@@ -135,9 +147,6 @@ nmap _ f_l
 nmap <leader>] "*yiw
 nmap <leader>p "_diwP
 
-nmap ]q :cnext<CR>
-nmap [q :cprev<CR>
-
 nnoremap <leader>d "_d
 vnoremap <leader>d "_d
 
@@ -147,6 +156,7 @@ cmap <C-P> <S-Right>
 map Q gq
 map Y y$
 cmap ][ '[,']
+nmap <F2> :set wrap!<CR>:set wrap?<CR>
 nmap <Tab> :buffers<CR>:buffer<Space>
 nmap <silent> <Home> :registers<CR>
 nmap <leader>' yiwciw"<C-r>""<ESC>
@@ -156,15 +166,6 @@ nmap <leader>sc 024i-<ESC>a >8 <ESC>24a-<ESC>
 nmap <leader><C-]> :vertical wincmd ]<CR>
 nnoremap <C-P> <C-I>
 
-nmap <F1> :help!<CR>
-imap <F1> <C-O>:help!<CR>
-
-nmap <leader>sp :setlocal spell spelllang=ru,en_gb
-highlight SpellBad cterm=inverse ctermfg=red ctermbg=black
-
-iabbrev итд и т.д.
-iabbrev итп и т.п.
-
 command! E Explore
 command! Ch cd %:p:h
 command! -bar -nargs=? -bang Tmp :silent vnew<bang>|setlocal buftype=nofile bufhidden=hide noswapfile buflisted filetype=<args> modifiable