X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=90aaf9f035ea148e2e6e4e52eaab7005a481583a;hb=9054016d07fca6fae86811aca3d136b473ceec83;hp=910136670dca171307860738c022a787dc73d7a4;hpb=8021548df30369a5efaba1c464ed04c11bb21f09;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index 9101366..90aaf9f 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -34,6 +34,7 @@ set showmatch
 set listchars=trail:·,tab:>→,nbsp:% ",eol:¶
 set list
 set completeopt-=preview
+set diffopt+=indent-heuristic,algorithm:histogram
 
 set cursorline
 set cursorcolumn
@@ -50,8 +51,8 @@ set hlsearch
 set incsearch
 set gdefault
 set wildmode=longest:list
-set tags=tags;,./;
-set wildignore=**/tags,**/.git
+set tags=.tags/**/tags;
+set wildignore=**/.git,**/.tags
 
 set exrc
 set secure
@@ -72,7 +73,10 @@ highlight CursorColumn ctermfg=cyan ctermbg=red
 
 " Statusline {{{
 set laststatus=2
-set statusline=%F\ %m%r%h%w%q%k\ %=
+set statusline=%F\ %m%r%h%w%k
+set statusline+=%{len(getqflist())?'[Q]':''}
+set statusline+=%{len(getloclist(0))?'[L]':''}
+set statusline+=\ %=
 set statusline+=%n\ %#Question#%Y
 set statusline+=%#DiffChange#%{strlen(&fenc)?&fenc:&enc}%{&bomb?'-bom':''}\ %{&ff}
 set statusline+=%#DiffAdd#%l/%L
@@ -123,6 +127,7 @@ set formatoptions+=onj
 " Spelling {{{
 set spelllang=ru,en_gb
 highlight SpellBad cterm=inverse ctermfg=red ctermbg=black
+highlight SpellLocal term=reverse ctermfg=red ctermbg=cyan
 " }}}
 
 " Unimpaired-like textwidth switching {{{
@@ -145,7 +150,6 @@ let g:sh_no_error = 1
 set termwinkey=<C-B>
 
 nmap <space> f<space>
-vmap <space> I<space><ESC>gv
 nmap _ f_l
 
 nmap <leader>] "*yiw
@@ -154,14 +158,9 @@ nmap <leader>p "_diwP
 nnoremap <leader>d "_d
 vnoremap <leader>d "_d
 
-cmap <C-O> <S-Left>
-cmap <C-P> <S-Right>
-
 map Q gq
-map Y y$
 cmap ][ '[,']
 imap <C-b> <C-x><C-o>
-nmap <F2> :set wrap!<CR>:set wrap?<CR>
 nmap <Tab> :buffers<CR>:b<Space>
 nmap <silent> <Home> :registers<CR>
 nmap <leader>' yiwciw"<C-r>""<ESC>