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, 19 insertions, 21 deletions

diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim
index 05c3e293..5cafdd70 100644
--- a/vim/after/ftplugin/sh.vim
+++ b/vim/after/ftplugin/sh.vim
@@ -1,22 +1,14 @@
-" Extra configuration for 'sh' filetypes
-if exists('b:did_ftplugin_after') || &compatible
+" Extra configuration for shell script
+if &filetype != 'sh' || &compatible || v:version < 700
   finish
 endif
-if v:version < 700
-  finish
-endif
-if &filetype !=# 'sh'
-  finish
-endif
-let b:did_ftplugin_after = 1
-let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|unlet b:did_ftplugin_after'
 
 " Set comment formats
 setlocal comments=:#
 setlocal formatoptions+=or
 let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|setlocal comments< formatoptions<'
+      \ . '|setlocal comments<'
+      \ . '|setlocal formatoptions<'
 
 " If subtype is Bash, set 'keywordprg' to han(1df)
 if exists('b:is_bash')
@@ -25,11 +17,6 @@ if exists('b:is_bash')
         \ . '|setlocal keywordprg<'
 endif
 
-" Stop here if the user doesn't want ftplugin mappings
-if exists('g:no_plugin_maps') || exists('g:no_sh_maps')
-  finish
-endif
-
 " Choose check compiler based on file subtype
 if exists('b:is_bash')
   let b:sh_check_compiler = 'bash'
@@ -38,12 +25,23 @@ elseif exists('b:is_kornshell')
 else
   let b:sh_check_compiler = 'sh'
 endif
+execute 'compiler '.b:sh_check_compiler
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|unlet b:current_compiler'
+      \ . '|unlet b:sh_check_compiler'
+      \ . '|setlocal errorformat<'
+      \ . '|setlocal makeprg<'
+
+" Stop here if the user doesn't want ftplugin mappings
+if exists('g:no_plugin_maps') || exists('g:no_sh_maps')
+  finish
+endif
 
-" Set mappings
-nnoremap <buffer> <LocalLeader>c
-      \ :<C-U>call compiler#Make(b:sh_check_compiler)<CR>
+" Mappings to choose compiler
+nnoremap <buffer> <expr> <LocalLeader>c
+      \ ':<C-U>compiler '.b:sh_check_compiler.'<CR>'
 nnoremap <buffer> <LocalLeader>l
-      \ :<C-U>call compiler#Make('shellcheck')<CR>
+      \ :<C-U>compiler shellcheck<CR>
 let b:undo_ftplugin = b:undo_ftplugin
       \ . '|nunmap <buffer> <LocalLeader>c'
       \ . '|nunmap <buffer> <LocalLeader>l'