From 0d8a2b3c99df6bc357378962e979b991e3d92256 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
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 ++++++++++++--------------
 2 files changed, 22 insertions(+), 26 deletions(-)

(limited to 'vim/after/ftplugin/html')

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<a href="">
-    " 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</a>
+  " Yank this whole whitespace-separated word
+  normal! yiW
+  " Open a link tag
+  normal! i<a href="">
+  " 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</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')
-- 
cgit v1.2.3