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, 10 insertions, 17 deletions

diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index 70e92dfd..765c1fb9 100644
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -1,34 +1,27 @@
-" Extra configuration for 'php' filetypes
-if exists('b:did_ftplugin_after') || &compatible
+" Extra configuration for PHP scripts
+if &filetype != 'php' || &compatible || v:version < 700
   finish
 endif
-if v:version < 700
-  finish
-endif
-if &filetype !=# 'php'
-  finish
-endif
-let b:did_ftplugin_after = 1
+
+" Use PHP itself for syntax checking
+compiler php
 let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|unlet b:did_ftplugin_after'
+      \ . '|unlet b:current_compiler'
+      \ . '|setlocal errorformat<'
+      \ . '|setlocal makeprg<'
 
 " Set comment formats
 setlocal comments=s1:/*,m:*,ex:*/,://,:#
 setlocal formatoptions+=or
 let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|setlocal comments< formatoptions<'
+      \ . '|setlocal comments<'
+      \ . '|setlocal formatoptions<'
 
 " Stop here if the user doesn't want ftplugin mappings
 if exists('g:no_plugin_maps') || exists('g:no_php_maps')
   finish
 endif
 
-" Set mappings
-nnoremap <buffer> <LocalLeader>c
-      \ :<C-U>call compiler#Make('php')<CR>
-let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|nunmap <buffer> <LocalLeader>c'
-
 " Get rid of the core ftplugin's square-bracket maps on unload
 let b:undo_ftplugin = b:undo_ftplugin
       \ . '|nunmap <buffer> [['