From 0d8a2b3c99df6bc357378962e979b991e3d92256 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 16 Jun 2018 13:16:28 +1200 Subject: Use `function!` consistently in ftplugins --- vim/after/ftplugin/zsh/check.vim | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'vim/after/ftplugin/zsh/check.vim') diff --git a/vim/after/ftplugin/zsh/check.vim b/vim/after/ftplugin/zsh/check.vim index 39faf44a..371ca2c6 100644 --- a/vim/after/ftplugin/zsh/check.vim +++ b/vim/after/ftplugin/zsh/check.vim @@ -10,18 +10,16 @@ if exists('b:undo_ftplugin') endif " Build function for checker -if !exists('*s:ZshCheck') - function s:ZshCheck() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - unlet! g:current_compiler - compiler zsh - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow - endfunction -endif +function! s:ZshCheck() + let l:save_makeprg = &l:makeprg + let l:save_errorformat = &l:errorformat + unlet! g:current_compiler + compiler zsh + make! + let &l:makeprg = l:save_makeprg + let &l:errorformat = l:save_errorformat + cwindow +endfunction " Set up a mapping for the checker, if we're allowed if !exists('g:no_plugin_maps') && !exists('g:no_zsh_maps') -- cgit v1.2.3 From 88defc4fc528bad2b0664c634d95e4363665472d Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 16 Jun 2018 21:59:31 +1200 Subject: Use short-circuit for no-mapping check --- vim/after/ftplugin/zsh/check.vim | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'vim/after/ftplugin/zsh/check.vim') diff --git a/vim/after/ftplugin/zsh/check.vim b/vim/after/ftplugin/zsh/check.vim index 371ca2c6..c0c8a342 100644 --- a/vim/after/ftplugin/zsh/check.vim +++ b/vim/after/ftplugin/zsh/check.vim @@ -22,26 +22,26 @@ function! s:ZshCheck() endfunction " Set up a mapping for the checker, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_zsh_maps') +if exists('g:no_plugin_maps') || exists('g:no_zsh_maps') + finish +endif - " Define a mapping target - nnoremap +" Define a mapping target +nnoremap + \ ZshCheck + \ :call ZshCheck() +if exists('b:undo_ftplugin') + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap ZshCheck' +endif + +" If there isn't a key mapping already, use a default one +if !hasmapto('ZshCheck') + nmap + \ c \ ZshCheck - \ :call ZshCheck() if exists('b:undo_ftplugin') let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap ZshCheck' - endif - - " If there isn't a key mapping already, use a default one - if !hasmapto('ZshCheck') - nmap - \ c - \ ZshCheck - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap c' - endif + \ . '|nunmap c' endif - endif -- cgit v1.2.3 From 81ff3c0f3ae44bb88a129b7395cb050290a37518 Mon Sep 17 00:00:00 2001 From: Tom Ryder 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/zsh/check.vim | 47 +++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 22 deletions(-) (limited to 'vim/after/ftplugin/zsh/check.vim') diff --git a/vim/after/ftplugin/zsh/check.vim b/vim/after/ftplugin/zsh/check.vim index c0c8a342..1d327a62 100644 --- a/vim/after/ftplugin/zsh/check.vim +++ b/vim/after/ftplugin/zsh/check.vim @@ -1,24 +1,31 @@ -" Only do this when not done yet for this buffer -" Also do nothing if 'compatible' enabled -if exists('b:did_ftplugin_zsh_check') || &compatible +" zsh/check.vim: Use Z shell binary to check for errors + +" Don't load if running compatible or too old +if &compatible || v:version < 700 finish endif -let b:did_ftplugin_zsh_check = 1 -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_zsh_check' + +" Don't load if already loaded +if exists('b:did_ftplugin_zsh_check') + finish endif +" Flag as loaded +let b:did_ftplugin_zsh_check = 1 +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_zsh_check' + " Build function for checker function! s:ZshCheck() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - unlet! g:current_compiler + if exists('b:current_compiler') + let l:save_compiler = b:current_compiler + endif compiler zsh - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow + lmake! + lwindow + if exists('l:save_compiler') + execute 'compiler ' . l:save_compiler + endif endfunction " Set up a mapping for the checker, if we're allowed @@ -30,18 +37,14 @@ endif nnoremap \ ZshCheck \ :call ZshCheck() -if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap ZshCheck' -endif +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap ZshCheck' " If there isn't a key mapping already, use a default one if !hasmapto('ZshCheck') nmap \ c \ ZshCheck - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap c' - endif + let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap c' endif -- cgit v1.2.3