X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=66b729b0ea068716dee5bbe414de7820fb346580;hb=c7a54e432d4b59c7b943aa827f3096306daef11b;hp=2c728ba32f085bd84712c8855d1b6707022ca0ef;hpb=092bb14d92b7fbdaa132fd2e2a70617a8045b6b3;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index 2c728ba..66b729b 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -9,9 +9,9 @@ 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
 set undodir=~/secure/vim/undo
 set undofile
@@ -31,13 +31,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,15 +51,15 @@ set smartcase
 set hlsearch
 set incsearch
 set gdefault
-set wildmode=longest:list
+map <F4> :nohlsearch<CR>:MarkClear<CR>
+
+set wildmode=list:longest
 set tags=.tags/**/tags;
 set wildignore=**/.git,**/.tags
 
 set exrc
 set secure
 
-map <F4> :nohlsearch<CR>:MarkClear<CR>
-
 " Folding {{{
 set foldmethod=indent
 set foldnestmax=9
@@ -72,7 +74,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
@@ -87,8 +92,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 {{{
@@ -142,11 +147,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
@@ -155,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>