From dc59d7e74635f9a56fef9049e34411d6ef535650 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 29 Nov 2018 23:26:52 +1300
Subject: Remove boilerplate after/ftplugin load guards

I'm likely going to move away from Vim 6.0 support, at least for all of
this filetype stuff.

We will keep the one filetype load guard we actually need, which is the
HTML one, to stop plugins like markdown.vim from loading it.
---
 vim/after/ftplugin/diff.vim | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'vim/after/ftplugin/diff.vim')

diff --git a/vim/after/ftplugin/diff.vim b/vim/after/ftplugin/diff.vim
index a52b3fdd..15682e7b 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
-- 
cgit v1.2.3


From 5f1f5b9de3d9ab80a0b5ecef4559b88990f42f4a Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 29 Nov 2018 23:29:09 +1300
Subject: Remove double-key mapping shortcuts

I never use these anyway; I'm firmly in the habit of using underscores
to represent the current line these days.
---
 vim/after/ftplugin/diff.vim | 2 --
 1 file changed, 2 deletions(-)

(limited to 'vim/after/ftplugin/diff.vim')

diff --git a/vim/after/ftplugin/diff.vim b/vim/after/ftplugin/diff.vim
index 15682e7b..1813e4b0 100644
--- a/vim/after/ftplugin/diff.vim
+++ b/vim/after/ftplugin/diff.vim
@@ -28,8 +28,6 @@ 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'
-- 
cgit v1.2.3


From 04cf824ac17f25ce36f04b5ab6c5e8befbe25e90 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 29 Nov 2018 23:30:11 +1300
Subject: Add missing detail to a comment

---
 vim/after/ftplugin/diff.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vim/after/ftplugin/diff.vim')

diff --git a/vim/after/ftplugin/diff.vim b/vim/after/ftplugin/diff.vim
index 1813e4b0..123f0d0a 100644
--- a/vim/after/ftplugin/diff.vim
+++ b/vim/after/ftplugin/diff.vim
@@ -23,7 +23,7 @@ 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
-- 
cgit v1.2.3