From 10c601851625784c7058f52c8d88bdb2e99b5620 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 8 Jul 2018 23:13:02 +1200
Subject: Overhaul base after-ftplugins

Mostly to simplify them--remove a lot of the load-guard cruft.
---
 vim/after/ftplugin/make.vim | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

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

diff --git a/vim/after/ftplugin/make.vim b/vim/after/ftplugin/make.vim
index 30db753f..b946d547 100644
--- a/vim/after/ftplugin/make.vim
+++ b/vim/after/ftplugin/make.vim
@@ -1,16 +1,7 @@
-" Extra configuration for 'make' filetypes
-if exists('b:did_ftplugin_after') || &compatible
+" Extra configuration for Makefiles
+if &filetype != 'make' || &compatible || v:version < 700
   finish
 endif
-if v:version < 700
-  finish
-endif
-if &filetype !=# 'make'
-  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_make_maps')
@@ -18,6 +9,8 @@ if exists('g:no_plugin_maps') || exists('g:no_make_maps')
 endif
 
 " Set mappings
-nmap <buffer> <LocalLeader>m <Plug>MakeTarget
-let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|nunmap <buffer> <LocalLeader>m'
+if exists('b:undo_ftplugin')
+  nmap <buffer> <LocalLeader>m <Plug>MakeTarget
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <LocalLeader>m'
+endif
-- 
cgit v1.2.3