X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=ffa302ccaf577ef43ec0add0115264f05e047bc5;hb=414abfe19189584f52d27c4850a2b2f7b5ce2522;hp=f26cf6ef1857670c6695eb36a7f7bdad19e6ea65;hpb=56bd70b9a34303f161c30fb2f6226a59babb4207;p=dotfiles.git diff --git a/vim/.vimrc b/vim/.vimrc index f26cf6e..ffa302c 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,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 :nohlsearch:MarkClear @@ -69,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 @@ -120,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 {{{