aboutsummaryrefslogtreecommitdiff
path: root/vim/after/ftplugin/diff.vim
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-30 00:09:51 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-30 00:09:51 +1300
commit94816757caac0120df020ea281a8ab020256de21 (patch)
tree854ae7eb90e67c9d24382018da2594cc9966f840 /vim/after/ftplugin/diff.vim
parentMerge branch 'release/v1.78.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-94816757caac0120df020ea281a8ab020256de21.tar.gz
dotfiles-94816757caac0120df020ea281a8ab020256de21.zip
Merge branch 'release/v2.0.0'v2.0.0
* release/v2.0.0: Update make_target.vim to v1.2.0 Comment conditional set of <Plug>(InsertCancel) Require Vim 7 for filetype and syntax highlights Simplify a load guard for sh.vim syntax tweaks Clear away a flag after HTML indent load Remove some Vim syntax boilerplate Pare down after/indent scripts a fair bit Remove some overzealous b:undo_* setting Add missing detail to a comment Remove double-key mapping shortcuts Remove boilerplate after/ftplugin load guards Simplify after/ftplugin for C Set b:did_ftplugin flag in Vim ftplugins Adjust a vimrc comment for clarity Simplify ft=sh subtype flag clearing Add dummy function for HTML omnicompletion Clear away stock ft=mail quoting maps Wrap autocmd! clear for ft=mail in :execute Add timestamp augroup clearing to Vim ft=html Abbreviate Vim ft=html autocmd clearing Restore value of 'colorcolumn' after ft=gitcommit Wrap Vim gitcommit autocmd clear in :execute
Diffstat (limited to 'vim/after/ftplugin/diff.vim')
-rw-r--r--vim/after/ftplugin/diff.vim9
1 files changed, 1 insertions, 8 deletions
diff --git a/vim/after/ftplugin/diff.vim b/vim/after/ftplugin/diff.vim
index a52b3fdd..123f0d0a 100644
--- a/vim/after/ftplugin/diff.vim
+++ b/vim/after/ftplugin/diff.vim
@@ -1,8 +1,3 @@
-" Extra configuration for diffs
-if &filetype !=# 'diff' || v:version < 700 || &compatible
- finish
-endif
-
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_diff_maps')
finish
@@ -28,13 +23,11 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>['
\ . '|xunmap <buffer> <LocalLeader>['
\ . '|xunmap <buffer> <LocalLeader>]'
-" Set mappings
+" Set mappings for diff pruning plugin
nmap <buffer> <LocalLeader>p
\ <Plug>(DiffPrune)
xmap <buffer> <LocalLeader>p
\ <Plug>(DiffPrune)
-nmap <buffer> <LocalLeader>pp
- \ <Plug>(DiffPrune)_
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>p'
\ . '|xunmap <buffer> <LocalLeader>p'
\ . '|nunmap <buffer> <LocalLeader>pp'