X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=1a02b400e28259065040041f6b401c331675dcdb;hb=5e6071fde8446388619054907977ed73fd9cc960;hp=f26cf6ef1857670c6695eb36a7f7bdad19e6ea65;hpb=56bd70b9a34303f161c30fb2f6226a59babb4207;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index f26cf6e..1a02b40 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -9,7 +9,8 @@ set encoding=utf-8
 "set t_kD=
 set mouse="" " if Vim is compiled with mouse support
 
-set viminfo='100,<50,s10,f1,%,n~/secure/vim/info
+set viminfo-=h
+set viminfo+=f1,%,n~/secure/vim/info
 set viewdir=~/secure/vim/view
 set history=128
 set directory=~/secure/vim/tmp
@@ -31,13 +32,15 @@ set highlight+=sr
 set cpoptions+=$
 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
 set colorcolumn=80
+
+set listchars=trail:·,tab:>→,nbsp:% ",eol:¶
+set list
 highlight ExtraWhitespace ctermbg=green ctermfg=blue
 match ExtraWhitespace /\s\+$/
 
@@ -49,12 +52,15 @@ set smartcase
 set hlsearch
 set incsearch
 set gdefault
-set wildmode=longest:list
-set tags=tags;,./;
-set wildignore=**/_build/*,**/tags,**/.git,**/.hypothesis
-
 map <F4> :nohlsearch<CR>:MarkClear<CR>
 
+set wildmode=list:longest
+set tags=.tags/**/tags;
+set wildignore=**/.git,**/.tags
+
+set exrc
+set secure
+
 " Folding {{{
 set foldmethod=indent
 set foldnestmax=9
@@ -69,7 +75,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
@@ -84,8 +93,8 @@ endfunction
 " }}}
 
 " View saving {{{
-autocmd BufWinLeave *.* mkview
-autocmd BufWinEnter *.* silent loadview
+autocmd BufWinLeave ?* silent! if &ft !=# "gitcommit" | mkview | endif
+autocmd BufWinEnter ?* silent loadview
 " }}}
 
 " Windows related {{{
@@ -120,6 +129,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 {{{
@@ -138,11 +148,9 @@ 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
 
 nmap <leader>] "*yiw
@@ -151,14 +159,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>