Merge branch 'release/v1.25.0'v1.25.0

* release/v1.25.0:
  Add extra Perl file detection rules
  Adjust comment on scripts.vim load
  Don't defer package load for matchit
  Clear b:current_compiler on unload
  Adjust comments in filetype.vim
  Specify which Vim to run in Makefile
  Tweak HTML indenting to indent after <p>
  Use !=# for &filetype match
  Revert :setglobal changes
  Overhaul ftplugin check, lint, tidy
  Change local leader back to comma
  Overhaul base after-ftplugins
  Remove Perl indent string again
  Tidy space and backspace mappings
  Upgrade and adjust config for diff_prune.vim
  Highlight overly long Git commit subjects as error
  Test 'modifiable' for spellchecking text/markdown
  Disable concealing when editing Vim help
  Add patterns for Vim help file detection
  Move shebang updating into filetype.vim
  Use stridx() for shebang check
  Correct filetype reset; blank, not NONE
  Correct a comment on shebang_update.vim

1 files changed, 7 insertions, 14 deletions

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