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 --- .gitmodules | 3 +++ vim/bundle/diff_prune | 1 + vim/vimrc | 11 +++++++++++ 3 files changed, 15 insertions(+) create mode 160000 vim/bundle/diff_prune diff --git a/.gitmodules b/.gitmodules index 30a58edc..dd10f0e4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,6 +8,9 @@ [submodule "vim/bundle/copy_linebreak"] path = vim/bundle/copy_linebreak url = https://sanctum.geek.nz/code/vim-copy-linebreak.git +[submodule "vim/bundle/diff_prune"] + path = vim/bundle/diff_prune + url = https://sanctum.geek.nz/code/vim-diff-prune.git [submodule "vim/bundle/fixed_join"] path = vim/bundle/fixed_join url = https://sanctum.geek.nz/code/vim-fixed-join.git diff --git a/vim/bundle/diff_prune b/vim/bundle/diff_prune new file mode 160000 index 00000000..7b135673 --- /dev/null +++ b/vim/bundle/diff_prune @@ -0,0 +1 @@ +Subproject commit 7b1356734b2262c46ffc401f2c89f183509ff77d 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