Simplify viminfo setting

[dotfiles.git] / vim / .vimrc

diff --git a/vim/.vimrc b/vim/.vimrc
index 67aed0fee77389086e794807add881154d47b769..1a02b400e28259065040041f6b401c331675dcdb 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -9,7 +9,8 @@ set encoding=utf-8
 "set t_kD=\7f
 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,14 +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\+$/
 
@@ -50,15 +52,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
@@ -91,7 +93,7 @@ endfunction
 " }}}
 
 " View saving {{{
-autocmd BufWinLeave ?* silent! mkview
+autocmd BufWinLeave ?* silent! if &ft !=# "gitcommit" | mkview | endif
 autocmd BufWinEnter ?* silent loadview
 " }}}
 
@@ -146,7 +148,6 @@ iabbrev итп и т.п.
 
 set keywordprg=
 let g:sh_no_error = 1
-
 set termwinkey=<C-B>
 
 nmap <space> f<space>