summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-04-27 10:38:19 +0100
committerUrbain Vaes <urbain@vaes.uk>2015-04-27 10:38:19 +0100
commitdbd95f31c1716b8a53e7dc64419b8cadcac01434 (patch)
tree6fc83d36bb7df6351a24ebc4104055cc69b52dbd
parent1e6d517f7928a54026f5e1ea46c4233d99911735 (diff)
Fixed clash <c-j> tmux-navigator >< ctrlp
-rw-r--r--vimrc5
1 files changed, 5 insertions, 0 deletions
diff --git a/vimrc b/vimrc
index d330909..772a7c8 100644
--- a/vimrc
+++ b/vimrc
@@ -75,6 +75,11 @@ let g:ctrlp_open_new_file = 't'
let g:ctrlp_show_hidden = 1
let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
let g:ctrlp_working_path_mode = 'r'
+let g:ctrlp_prompt_mappings = {
+\ 'PrtSelectMove("j")': ['<c-n>'],
+\ 'PrtSelectMove("k")': ['<c-p>'],
+\ 'PrtHistory(-1)': ['<down>'],
+\ 'PrtHistory(1)': ['<up>'],}
let g:syntastic_cpp_compiler = 'clang++'
let g:syntastic_cpp_compiler_options = ' -std=c++11 -stdlib=libc++'