X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=vim%2F.vimrc;h=9f9b57fd84661e4edda41cfff4676d4982eb76db;hb=716ecfbe5482b4d4c510059569e826eda511d018;hp=67aed0fee77389086e794807add881154d47b769;hpb=113ec209db0e5de8acbc1e7617de62b4d544207a;p=dotfiles.git

diff --git a/vim/.vimrc b/vim/.vimrc
index 67aed0f..9f9b57f 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -31,14 +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\+$/
 
@@ -50,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
@@ -91,7 +92,7 @@ endfunction
 " }}}
 
 " View saving {{{
-autocmd BufWinLeave ?* silent! mkview
+autocmd BufWinLeave ?* silent! if &ft !=# "gitcommit" | mkview | endif
 autocmd BufWinEnter ?* silent loadview
 " }}}
 
@@ -146,7 +147,6 @@ iabbrev итп и т.п.
 
 set keywordprg=
 let g:sh_no_error = 1
-
 set termwinkey=<C-B>
 
 nmap <space> f<space>