diff options
Diffstat (limited to 'vim/after/ftplugin/diff.vim')
| -rw-r--r-- | vim/after/ftplugin/diff.vim | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/vim/after/ftplugin/diff.vim b/vim/after/ftplugin/diff.vim index 6098ce48..5b0e7b31 100644 --- a/vim/after/ftplugin/diff.vim +++ b/vim/after/ftplugin/diff.vim @@ -1,16 +1,7 @@ -" Extra configuration for 'diff' filetypes -if exists('b:did_ftplugin_after') || &compatible +" Extra configuration for diffs +if &filetype != 'diff' || &compatible || v:version < 700 finish endif -if v:version < 700 - finish -endif -if &filetype !=# 'diff' - finish -endif -let b:did_ftplugin_after = 1 -let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_after' " Stop here if the user doesn't want ftplugin mappings if exists('g:no_plugin_maps') || exists('g:no_diff_maps') @@ -18,8 +9,10 @@ if exists('g:no_plugin_maps') || exists('g:no_diff_maps') endif " Set mappings -nmap <buffer> <LocalLeader>p <Plug>DiffPrune -xmap <buffer> <LocalLeader>p <Plug>DiffPrune +nmap <buffer> <LocalLeader>p <Plug>(DiffPrune) +xmap <buffer> <LocalLeader>p <Plug>(DiffPrune) +nmap <buffer> <LocalLeader>pp <Plug>(DiffPrune)_ let b:undo_ftplugin = b:undo_ftplugin \ . '|nunmap <buffer> <LocalLeader>p' \ . '|xunmap <buffer> <LocalLeader>p' + \ . '|nunmap <buffer> <LocalLeader>pp' |