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, 15 insertions, 23 deletions

diff --git a/vim/after/ftplugin/html.vim b/vim/after/ftplugin/html.vim
index 8a1c22d4..d0625fb7 100644
--- a/vim/after/ftplugin/html.vim
+++ b/vim/after/ftplugin/html.vim
@@ -1,28 +1,26 @@
-" Extra configuration for 'html' filetypes
-if exists('b:did_ftplugin_after') || &compatible
+" Extra configuration for HTML files
+if &filetype != 'html' || &compatible || v:version < 700
   finish
 endif
-if v:version < 700
-  finish
-endif
-if &filetype !=# 'html'
-  finish
-endif
-let b:did_ftplugin_after = 1
+
+" Use tidy(1) for checking and program formatting
+compiler tidy
+setlocal equalprg=tidy\ -quiet
 let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|unlet b:did_ftplugin_after'
+      \ . '|unlet b:current_compiler'
+      \ . '|setlocal equalprg<'
+      \ . '|setlocal errorformat<'
+      \ . '|setlocal makeprg<'
 
 " Set up hooks for timestamp updating
 augroup html_timestamp
-  autocmd!
-  autocmd BufWritePre *.html
-        \ if exists('b:html_timestamp_check')
-        \|  call html#TimestampUpdate()
-        \|endif
+  autocmd BufWritePre <buffer>
+	\ if exists('b:html_timestamp_check')
+	\|  call html#TimestampUpdate()
+	\|endif
 augroup END
 let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|augroup html_timestamp|autocmd!|augroup END'
-      \ . '|augroup! html_timestamp'
+      \ . '|autocmd! html_timestamp BufWritePre <buffer>'
 
 " Stop here if the user doesn't want ftplugin mappings
 if exists('g:no_plugin_maps') || exists('g:no_html_maps')
@@ -30,13 +28,7 @@ if exists('g:no_plugin_maps') || exists('g:no_html_maps')
 endif
 
 " Set mappings
-nnoremap <buffer> <LocalLeader>l
-      \ :<C-U>call compiler#Make('tidy')<CR>
 nnoremap <buffer> <LocalLeader>r
       \ :<C-U>call html#UrlLink()<CR>
-nnoremap <buffer> <LocalLeader>t
-      \ :<C-U>call filter#Stable('tidy -quiet')<CR>
 let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|nunmap <buffer> <LocalLeader>l'
       \ . '|nunmap <buffer> <LocalLeader>r'
-      \ . '|nunmap <buffer> <LocalLeader>t'