diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-12 01:20:13 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-12 01:20:13 +1200 |
| commit | e3cfbf8e680aae93fcb778a77c20247570453c8c (patch) | |
| tree | 63631f2ea936b6e92db315e99031fde422f5d727 /vim/after/ftplugin/diff.vim | |
| parent | Merge branch 'release/v1.25.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-e3cfbf8e680aae93fcb778a77c20247570453c8c.tar.gz dotfiles-e3cfbf8e680aae93fcb778a77c20247570453c8c.zip | |
Merge branch 'release/v1.26.0'v1.26.0
* release/v1.26.0:
Bump VERSION
Upgrade insert_cancel.vim again
Check for +conceal before setting 'conceallevel'
Upgrade insert_cancel.vim
Remove session_lazy.vim
Add missing dot to mutt filetype.vim path
Add session_lazy.vim plugin
Add 'sessionoptions' settings
Correct login around ftplugin/make.vim mappings
Move after/ftplugin/sed.vim to ftplugin/sed.vim
Clean up existing ftplugins a bit
Overhaul after/ftplugin
Add explicit group to ftdetect rule
Move angle-bracket matchpairs to Perl filetype
Diffstat (limited to 'vim/after/ftplugin/diff.vim')
| -rw-r--r-- | vim/after/ftplugin/diff.vim | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vim/after/ftplugin/diff.vim b/vim/after/ftplugin/diff.vim index 5b0e7b31..1e2bb2f8 100644 --- a/vim/after/ftplugin/diff.vim +++ b/vim/after/ftplugin/diff.vim @@ -1,5 +1,5 @@ " Extra configuration for diffs -if &filetype != 'diff' || &compatible || v:version < 700 +if &filetype !=# 'diff' || v:version < 700 || &compatible finish endif @@ -12,7 +12,6 @@ endif 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' +let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>p' \ . '|xunmap <buffer> <LocalLeader>p' \ . '|nunmap <buffer> <LocalLeader>pp' |