zsh: add `git stash` aliases

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 145b8ce7de5c10aefed607739cc3f7ff63b9badf..7338d4da066c760d188dd07a58deafe3ddc5331e 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -213,7 +213,6 @@ set viewoptions=cursor          " only save cursor position
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
-set diffopt+=iwhite         " ignore white space
 set diffopt+=context:10     " 10 lines context between changes
 
 " reading and writing files {{{2
@@ -436,6 +435,7 @@ nnoremap zx zMzxzt
 
 map <F1> :ls<CR>:b<space>
 
+" move between windows
 nnoremap <C-L> <C-W>w
 nnoremap <C-H> <C-W>W
 
@@ -543,13 +543,13 @@ nmap <silent> cog <Plug>IndentGuidesToggle
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 
-" quit-another-window {{{2
+" close-another-window {{{2
 nnoremap <silent> <C-W>c  <NOP>
 nnoremap <silent> <C-W>cc <C-W>c
-nnoremap <silent> <C-W>ch :Qh<CR>
-nnoremap <silent> <C-W>cl :Ql<CR>
-nnoremap <silent> <C-W>cj :Qj<CR>
-nnoremap <silent> <C-W>ck :Qk<CR>
+nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
+nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
+nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
+nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
 
 " python-mode {{{2