X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=ffa302ccaf577ef43ec0add0115264f05e047bc5;hb=05bc386c693c3a5a8da95636eddb2dbeecd22ff0;hp=ab10103833a82475e7471909ffd379c2593ea820;hpb=3813c015a961725b28fb90cefaaf565e9ebc8937;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index ab10103..ffa302c 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -33,6 +33,8 @@ set showcmd
 set showmatch
 set listchars=trail:·,tab:>→,nbsp:% ",eol:¶
 set list
+set completeopt-=preview
+set diffopt+=indent-heuristic,algorithm:histogram
 
 set cursorline
 set cursorcolumn
@@ -49,8 +51,11 @@ set hlsearch
 set incsearch
 set gdefault
 set wildmode=longest:list
-set tags=tags;,./;
-set wildignore=**/_build/*,**/tags,**/.git,**/.hypothesis
+set tags=.tags/**/tags;
+set wildignore=**/.git,**/.tags
+
+set exrc
+set secure
 
 map <F4> :nohlsearch<CR>:MarkClear<CR>
 
@@ -68,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%q%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
@@ -88,6 +96,7 @@ autocmd BufWinEnter *.* silent loadview
 " }}}
 
 " Windows related {{{
+nnoremap <C-b> <C-W>
 noremap <C-j> <C-w>j
 noremap <C-k> <C-w>k
 noremap <C-l> <C-w>l
@@ -118,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 {{{
@@ -137,6 +147,8 @@ iabbrev итп и т.п.
 set keywordprg=
 let g:sh_no_error = 1
 
+set termwinkey=<C-B>
+
 nmap <space> f<space>
 vmap <space> I<space><ESC>gv
 nmap _ f_l
@@ -153,6 +165,7 @@ 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>