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/html/lint.vim | 22 ++++++++++------------ vim/after/ftplugin/html/url_link.vim | 26 ++++++++++++-------------- vim/after/ftplugin/perl/check.vim | 22 ++++++++++------------ vim/after/ftplugin/perl/lint.vim | 22 ++++++++++------------ vim/after/ftplugin/php/check.vim | 34 ++++++++++++++++------------------ vim/after/ftplugin/sh/lint.vim | 22 ++++++++++------------ vim/after/ftplugin/vim/lint.vim | 22 ++++++++++------------ vim/after/ftplugin/zsh/check.vim | 22 ++++++++++------------ 8 files changed, 88 insertions(+), 104 deletions(-) (limited to 'vim/after/ftplugin') diff --git a/vim/after/ftplugin/html/lint.vim b/vim/after/ftplugin/html/lint.vim index b24b18c9..65742267 100644 --- a/vim/after/ftplugin/html/lint.vim +++ b/vim/after/ftplugin/html/lint.vim @@ -16,18 +16,16 @@ if exists('b:undo_ftplugin') endif " Build function for linter -if !exists('*s:HtmlLint') - function s:HtmlLint() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - unlet! g:current_compiler - compiler tidy - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow - endfunction -endif +function! s:HtmlLint() + let l:save_makeprg = &l:makeprg + let l:save_errorformat = &l:errorformat + unlet! g:current_compiler + compiler tidy + make! + let &l:makeprg = l:save_makeprg + let &l:errorformat = l:save_errorformat + cwindow +endfunction " Set up a mapping for the linter, if we're allowed if !exists('g:no_plugin_maps') && !exists('g:no_html_maps') diff --git a/vim/after/ftplugin/html/url_link.vim b/vim/after/ftplugin/html/url_link.vim index 2e600b5e..a5a926d6 100644 --- a/vim/after/ftplugin/html/url_link.vim +++ b/vim/after/ftplugin/html/url_link.vim @@ -14,22 +14,20 @@ if exists('b:undo_ftplugin') endif " Make a bare URL into a link to itself -if !exists('*s:HtmlUrlLink') - function! s:HtmlUrlLink() +function! s:HtmlUrlLink() - " Yank this whole whitespace-separated word - normal! yiW - " Open a link tag - normal! i - " Paste the URL into the quotes - normal! hP - " Move to the end of the link text URL - normal! E - " Close the link tag - normal! a + " Yank this whole whitespace-separated word + normal! yiW + " Open a link tag + normal! i + " Paste the URL into the quotes + normal! hP + " Move to the end of the link text URL + normal! E + " Close the link tag + normal! a - endfunction -endif +endfunction " Set up a mapping for the function, if we're allowed if !exists('g:no_plugin_maps') && !exists('g:no_html_maps') diff --git a/vim/after/ftplugin/perl/check.vim b/vim/after/ftplugin/perl/check.vim index df90784f..a9b23c2b 100644 --- a/vim/after/ftplugin/perl/check.vim +++ b/vim/after/ftplugin/perl/check.vim @@ -10,18 +10,16 @@ if exists('b:undo_ftplugin') endif " Build function for checker -if !exists('*s:PerlCheck') - function s:PerlCheck() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - unlet! g:current_compiler - compiler perl - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow - endfunction -endif +function! s:PerlCheck() + let l:save_makeprg = &l:makeprg + let l:save_errorformat = &l:errorformat + unlet! g:current_compiler + compiler perl + 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_perl_maps') diff --git a/vim/after/ftplugin/perl/lint.vim b/vim/after/ftplugin/perl/lint.vim index 48b23091..235ee69a 100644 --- a/vim/after/ftplugin/perl/lint.vim +++ b/vim/after/ftplugin/perl/lint.vim @@ -10,18 +10,16 @@ if exists('b:undo_ftplugin') endif " Build function for linter -if !exists('*s:PerlLint') - function s:PerlLint() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - unlet! g:current_compiler - compiler perlcritic - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow - endfunction -endif +function! s:PerlLint() + let l:save_makeprg = &l:makeprg + let l:save_errorformat = &l:errorformat + unlet! g:current_compiler + compiler perlcritic + make! + let &l:makeprg = l:save_makeprg + let &l:errorformat = l:save_errorformat + cwindow +endfunction " Set up a mapping for the linter, if we're allowed if !exists('g:no_plugin_maps') && !exists('g:no_perl_maps') diff --git a/vim/after/ftplugin/php/check.vim b/vim/after/ftplugin/php/check.vim index 33077a72..58b41c21 100644 --- a/vim/after/ftplugin/php/check.vim +++ b/vim/after/ftplugin/php/check.vim @@ -10,26 +10,24 @@ if exists('b:undo_ftplugin') endif " Build function for checker -if !exists('*s:PhpCheck') - function s:PhpCheck() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - unlet! g:current_compiler - compiler php +function! s:PhpCheck() + let l:save_makeprg = &l:makeprg + let l:save_errorformat = &l:errorformat + unlet! g:current_compiler + compiler php - " 7.4.191 is the earliest version with the :S file name modifier, which we - " really should use if we can - if v:version >= 704 || v:version == 704 && has('patch191') - make! %:S - else - make! % - endif + " 7.4.191 is the earliest version with the :S file name modifier, which we + " really should use if we can + if v:version >= 704 || v:version == 704 && has('patch191') + make! %:S + else + make! % + endif - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow - endfunction -endif + 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_php_maps') diff --git a/vim/after/ftplugin/sh/lint.vim b/vim/after/ftplugin/sh/lint.vim index 7d6e4d75..a8d65702 100644 --- a/vim/after/ftplugin/sh/lint.vim +++ b/vim/after/ftplugin/sh/lint.vim @@ -25,18 +25,16 @@ if exists('b:undo_ftplugin') endif " Build function for checker -if !exists('*s:ShLint') - 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 - endfunction -endif +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 +endfunction " Set up a mapping for the linter, if we're allowed if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps') diff --git a/vim/after/ftplugin/vim/lint.vim b/vim/after/ftplugin/vim/lint.vim index 2c402964..86a8b16f 100644 --- a/vim/after/ftplugin/vim/lint.vim +++ b/vim/after/ftplugin/vim/lint.vim @@ -10,18 +10,16 @@ if exists('b:undo_ftplugin') endif " Build function for checker -if !exists('*s:VimLint') - function s:VimLint() - let l:save_makeprg = &l:makeprg - let l:save_errorformat = &l:errorformat - unlet! g:current_compiler - compiler vint - make! - let &l:makeprg = l:save_makeprg - let &l:errorformat = l:save_errorformat - cwindow - endfunction -endif +function! s:VimLint() + let l:save_makeprg = &l:makeprg + let l:save_errorformat = &l:errorformat + unlet! g:current_compiler + compiler vint + make! + let &l:makeprg = l:save_makeprg + let &l:errorformat = l:save_errorformat + cwindow +endfunction " Set up a mapping for the linter, if we're allowed if !exists('g:no_plugin_maps') && !exists('g:no_vim_maps') 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