aboutsummaryrefslogtreecommitdiff
path: root/vim/vimrc
diff options
context:
space:
mode:
Diffstat (limited to 'vim/vimrc')
-rw-r--r--vim/vimrc11
1 files changed, 11 insertions, 0 deletions
diff --git a/vim/vimrc b/vim/vimrc
index ab4e971d..5eadb86a 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -272,6 +272,17 @@ nmap \x <Plug>StripTrailingWhitespace
" \z sets NZ English spelling (compare \u)
nnoremap \z :<C-U>setlocal spelllang=en_nz spelllang?<CR>
+" Key bindings for diff mode
+if has('autocmd') && v:version >= 700
+ augroup vimrc
+ autocmd!
+ autocmd FileType diff
+ \ nmap <buffer> <LocalLeader>p <Plug>DiffPrune
+ autocmd FileType diff
+ \ xmap <buffer> <LocalLeader>p <Plug>DiffPrune
+ augroup END
+endif
+
" Add packaged matchit.vim, if supported
if has('packages')
packadd! matchit