From 88defc4fc528bad2b0664c634d95e4363665472d Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 16 Jun 2018 21:59:31 +1200
Subject: Use short-circuit for no-mapping check

---
 vim/after/ftplugin/sh/check.vim | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'vim/after/ftplugin/sh/check.vim')

diff --git a/vim/after/ftplugin/sh/check.vim b/vim/after/ftplugin/sh/check.vim
index 3eaf3f57..dce6552c 100644
--- a/vim/after/ftplugin/sh/check.vim
+++ b/vim/after/ftplugin/sh/check.vim
@@ -38,27 +38,27 @@ if !exists('*s:ShCheck')
   endfunction
 endif
 
-" Set up a mapping for the checker, if we're allowed
-if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps')
+" Stop here if the user doesn't want ftplugin mappings
+if exists('g:no_plugin_maps') || exists('g:no_sh_maps')
+  finish
+endif
 
-  " Define a mapping target
-  nnoremap <buffer> <silent> <unique>
+" Define a mapping target
+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
+
+" If there isn't a key mapping already, use a default one
+if !hasmapto('<Plug>ShCheck')
+  nmap <buffer> <unique>
+        \ <LocalLeader>c
         \ <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
-
-  " 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
+          \ . '|nunmap <buffer> <LocalLeader>c'
   endif
-
 endif
-- 
cgit v1.2.3


From 81ff3c0f3ae44bb88a129b7395cb050290a37518 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 17 Jun 2018 00:19:45 +1200
Subject: 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
---
 vim/after/ftplugin/sh/check.vim | 74 ++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 41 deletions(-)

(limited to 'vim/after/ftplugin/sh/check.vim')

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
-- 
cgit v1.2.3