DiffMode bindings, CtrlP ignores

This commit is contained in:
vasili
2013-05-15 17:15:17 -07:00
parent ad0dbd6b5f
commit fee9a74d7c

10
vimrc
View File

@@ -24,6 +24,10 @@ if has("autocmd")
"Automatically reload VIMRC file after saving
autocmd bufwritepost .vimrc source $MYVIMRC
autocmd bufwritepost _vimrc source $MYVIMRC
"Mappings for diff mode
autocmd filterwritepre * if &diff | map <leader>{ :diffget \\2<cr>| endif
autocmd filterwritepre * if &diff | map <leader>} :diffget \\3<cr>| endif
endif
"Set <leader> before any key remapping
let mapleader = '\'
@@ -87,3 +91,9 @@ endif
nmap <leader>] :bn<cr>
nmap <leader>[ :bp<cr>
if(has("win32") || has("win16"))
set wildignore+=*/Deploy/*,*/node_modules/*
else
endif