From 97d3c005b9825e605a4524295733330c473a0d33 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 25 Jun 2018 08:38:49 +1200 Subject: Add diff_prune.vim ftplugin --- vim/vimrc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'vim/vimrc') diff --git a/vim/vimrc b/vim/vimrc index ab4e971d..5eadb86a 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -272,6 +272,17 @@ nmap \x StripTrailingWhitespace " \z sets NZ English spelling (compare \u) nnoremap \z :setlocal spelllang=en_nz spelllang? +" Key bindings for diff mode +if has('autocmd') && v:version >= 700 + augroup vimrc + autocmd! + autocmd FileType diff + \ nmap p DiffPrune + autocmd FileType diff + \ xmap p DiffPrune + augroup END +endif + " Add packaged matchit.vim, if supported if has('packages') packadd! matchit -- cgit v1.2.3