Completely overhaul after/ftplugin files

Should have done some of this in separate commits; oh well.

* Rewrite headers for each ftplugin
* Require Vim version >= 7.0, and thereby:
    * Switch back to location list
    * Don't check for b:undo_ftplugin existence, assume it
* Save and restore compiler instead of internal options
* Add bash, ksh, sh, and shellcheck compilers
* Rename mail/format_flowed.vim to mail/flowed.vim
* Rename sh/bash_han.vim to sh/han.vim

5 files changed, 85 insertions, 125 deletions

diff --git a/vim/after/ftplugin/sh/bash_han.vim b/vim/after/ftplugin/sh/bash_han.vim
deleted file mode 100644
index a160165c..00000000
--- a/vim/after/ftplugin/sh/bash_han.vim
+++ /dev/null
@@ -1,19 +0,0 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled
-if exists('b:did_ftplugin_sh_bash_han') || &compatible
-  finish
-endif
-let b:did_ftplugin_sh_bash_han = 1
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:did_ftplugin_sh_bash_han'
-endif
-
-" Use han(1df) as a man(1) wrapper for Bash files if available
-if exists('b:is_bash') && executable('han')
-  setlocal keywordprg=han
-  if exists('b:undo_ftplugin')
-    let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|setlocal keywordprg<'
-  endif
-endif
diff --git a/vim/after/ftplugin/sh/check.vim b/vim/after/ftplugin/sh/check.vim
index dce6552c..e92409cf 100644
--- a/vim/after/ftplugin/sh/check.vim
+++ b/vim/after/ftplugin/sh/check.vim
@@ -1,42 +1,38 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled
-if exists('b:did_ftplugin_sh_check') || &compatible
+" sh/check.vim: Use appropriate shell binary to check scripts for errors
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
   finish
 endif
-let b:did_ftplugin_sh_check = 1
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:did_ftplugin_sh_check'
-endif
 
-" Choose checker based on shell family
-if exists('b:is_bash')
-  let b:sh_check_makeprg = 'bash -n %:S'
-elseif exists('b:is_kornshell')
-  let b:sh_check_makeprg = 'ksh -n %:S'
-else
-  let b:sh_check_makeprg = 'sh -n %:S'
-endif
-let b:sh_check_errorformat = '%f: %l: %m'
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:sh_check_makeprg'
-        \ . '|unlet b:sh_check_errorformat'
+" Don't load if already loaded
+if exists('b:did_ftplugin_sh_check')
+  finish
 endif
 
+" Flag as loaded
+let b:did_ftplugin_sh_check = 1
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|unlet b:did_ftplugin_sh_check'
+
 " Build function for checker
-if !exists('*s:ShCheck')
-  function s:ShCheck()
-    let l:save_makeprg = &l:makeprg
-    let l:save_errorformat = &l:errorformat
-    let &l:makeprg = b:sh_check_makeprg
-    let &l:errorformat = b:sh_check_errorformat
-    make!
-    let &l:makeprg = l:save_makeprg
-    let &l:errorformat = l:save_errorformat
-    cwindow
-  endfunction
-endif
+function! s:ShCheck()
+  if exists('b:current_compiler')
+    let l:save_compiler = b:current_compiler
+  endif
+  if exists('b:is_bash')
+    compiler bash
+  elseif exists('b:is_kornshell')
+    compiler ksh
+  else
+    compiler sh
+  endif
+  lmake!
+  lwindow
+  if exists('l:save_compiler')
+    execute 'compiler ' . l:save_compiler
+  endif
+endfunction
 
 " Stop here if the user doesn't want ftplugin mappings
 if exists('g:no_plugin_maps') || exists('g:no_sh_maps')
@@ -47,18 +43,14 @@ endif
 nnoremap <buffer> <silent> <unique>
       \ <Plug>ShCheck
       \ :<C-U>call <SID>ShCheck()<CR>
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|nunmap <buffer> <Plug>ShCheck'
-endif
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|nunmap <buffer> <Plug>ShCheck'
 
 " If there isn't a key mapping already, use a default one
 if !hasmapto('<Plug>ShCheck')
   nmap <buffer> <unique>
         \ <LocalLeader>c
         \ <Plug>ShCheck
-  if exists('b:undo_ftplugin')
-    let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|nunmap <buffer> <LocalLeader>c'
-  endif
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <LocalLeader>c'
 endif
diff --git a/vim/after/ftplugin/sh/han.vim b/vim/after/ftplugin/sh/han.vim
new file mode 100644
index 00000000..3aacdb7e
--- /dev/null
+++ b/vim/after/ftplugin/sh/han.vim
@@ -0,0 +1,26 @@
+" sh/han.vim: Use han(1df) as 'keywordprg' for Bash scripts
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
+  finish
+endif
+
+" Don't load if already loaded
+if exists('b:did_ftplugin_sh_han')
+  finish
+endif
+
+" Don't load if this isn't Bash or if han(1df) isn't available
+if !exists('b:is_bash') || !executable('han')
+  finish
+endif
+
+" Flag as loaded
+let b:did_ftplugin_sh_han = 1
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|unlet b:did_ftplugin_sh_han'
+
+" Set 'keywordprg' to han(1df)
+setlocal keywordprg=han
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|setlocal keywordprg<'
diff --git a/vim/after/ftplugin/sh/lint.vim b/vim/after/ftplugin/sh/lint.vim
index b89645f7..87f1c07e 100644
--- a/vim/after/ftplugin/sh/lint.vim
+++ b/vim/after/ftplugin/sh/lint.vim
@@ -1,39 +1,31 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled
-if exists('b:did_ftplugin_sh_lint') || &compatible
+" sh/lint.vim: Use appropriate shell binary to lint scripts for errors
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
   finish
 endif
-let b:did_ftplugin_sh_lint = 1
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:did_ftplugin_sh_lint'
-endif
 
-" Choose linter based on shell family
-if exists('b:is_bash')
-  let b:sh_lint_makeprg = 'shellcheck -e SC1090 -f gcc -s bash %:S'
-elseif exists('b:is_kornshell')
-  let b:sh_lint_makeprg = 'shellcheck -e SC1090 -f gcc -s ksh %:S'
-else
-  let b:sh_lint_makeprg = 'shellcheck -e SC1090 -f gcc -s sh %:S'
-endif
-let b:sh_lint_errorformat = '%f:%l:%c: %m [SC%n]'
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:sh_lint_makeprg'
-        \ . '|unlet b:sh_lint_errorformat'
+" Don't load if already loaded
+if exists('b:did_ftplugin_sh_lint')
+  finish
 endif
 
-" Build function for checker
+" Flag as loaded
+let b:did_ftplugin_sh_lint = 1
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|unlet b:did_ftplugin_sh_lint'
+
+" Build function for linter
 function! s:ShLint()
-  let l:save_makeprg = &l:makeprg
-  let l:save_errorformat = &l:errorformat
-  let &l:makeprg = b:sh_lint_makeprg
-  let &l:errorformat = b:sh_lint_errorformat
-  make!
-  let &l:makeprg = l:save_makeprg
-  let &l:errorformat = l:save_errorformat
-  cwindow
+  if exists('b:current_compiler')
+    let l:save_compiler = b:current_compiler
+  endif
+  compiler shellcheck
+  lmake!
+  lwindow
+  if exists('l:save_compiler')
+    execute 'compiler ' . l:save_compiler
+  endif
 endfunction
 
 " Stop here if the user doesn't want ftplugin mappings
@@ -45,18 +37,14 @@ endif
 nnoremap <buffer> <silent> <unique>
       \ <Plug>ShLint
       \ :<C-U>call <SID>ShLint()<CR>
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|nunmap <buffer> <Plug>ShLint'
-endif
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|nunmap <buffer> <Plug>ShLint'
 
 " If there isn't a key mapping already, use a default one
 if !hasmapto('<Plug>ShLint')
   nmap <buffer> <unique>
         \ <LocalLeader>l
         \ <Plug>ShLint
-  if exists('b:undo_ftplugin')
-    let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|nunmap <buffer> <LocalLeader>l'
-  endif
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <LocalLeader>l'
 endif
diff --git a/vim/after/ftplugin/sh/posix.vim b/vim/after/ftplugin/sh/posix.vim
deleted file mode 100644
index a1b2c7ff..00000000
--- a/vim/after/ftplugin/sh/posix.vim
+++ /dev/null
@@ -1,27 +0,0 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled
-if exists('b:did_ftplugin_sh_posix') || &compatible
-  finish
-endif
-let b:did_ftplugin_sh_posix = 1
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:did_ftplugin_sh_posix'
-endif
-
-"
-" If we have a #!/bin/sh shebang and filetype.vim determined we were neither
-" POSIX nor Bash nor Korn shell, we'll guess POSIX, just because it's far more
-" likely that's what I want to write than plain Bourne shell.
-"
-" You're supposed to be able to do this by setting g:is_posix, but if that's
-" set, the syntax file ends up setting g:is_kornshell for you too, for reasons
-" I don't really understand. This method works though, and is cleaner than
-" the other workaround I had been trying.
-"
-if exists('b:is_sh')
-  unlet b:is_sh
-  if !exists('b:is_bash') && !exists('b:is_kornshell')
-    let b:is_posix = 1
-  endif
-endif