Make views for files without extensions

[dotfiles.git] / vim / .vimrc

diff --git a/vim/.vimrc b/vim/.vimrc
index 2c728ba32f085bd84712c8855d1b6707022ca0ef..67aed0fee77389086e794807add881154d47b769 100644 (file)
--- 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
@@ -72,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%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 +91,8 @@ endfunction
 " }}}
 
 " View saving {{{
-autocmd BufWinLeave *.* mkview
-autocmd BufWinEnter *.* silent loadview
+autocmd BufWinLeave ?* silent! mkview
+autocmd BufWinEnter ?* silent loadview
 " }}}
 
 " Windows related {{{
@@ -146,7 +150,6 @@ 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>