From 2f0521a6a2452ea496708df1a138d78e77571df3 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 19 Nov 2017 23:33:08 +1300
Subject: Force g:current_compiler removal before check/lint

This seems to be necessary for Vim 6.
---
 vim/after/ftplugin/html/lint.vim  | 1 +
 vim/after/ftplugin/perl/check.vim | 1 +
 vim/after/ftplugin/perl/lint.vim  | 1 +
 vim/after/ftplugin/vim/lint.vim   | 1 +
 vim/compiler/perlcritic.vim       | 2 +-
 vim/compiler/vint.vim             | 2 +-
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/vim/after/ftplugin/html/lint.vim b/vim/after/ftplugin/html/lint.vim
index 47ab3766..c0fdc44f 100644
--- a/vim/after/ftplugin/html/lint.vim
+++ b/vim/after/ftplugin/html/lint.vim
@@ -16,6 +16,7 @@ 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
diff --git a/vim/after/ftplugin/perl/check.vim b/vim/after/ftplugin/perl/check.vim
index 92f4b7a6..df90784f 100644
--- a/vim/after/ftplugin/perl/check.vim
+++ b/vim/after/ftplugin/perl/check.vim
@@ -14,6 +14,7 @@ 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
diff --git a/vim/after/ftplugin/perl/lint.vim b/vim/after/ftplugin/perl/lint.vim
index 0f2f0cd7..48b23091 100644
--- a/vim/after/ftplugin/perl/lint.vim
+++ b/vim/after/ftplugin/perl/lint.vim
@@ -14,6 +14,7 @@ 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
diff --git a/vim/after/ftplugin/vim/lint.vim b/vim/after/ftplugin/vim/lint.vim
index 243f9463..2c402964 100644
--- a/vim/after/ftplugin/vim/lint.vim
+++ b/vim/after/ftplugin/vim/lint.vim
@@ -14,6 +14,7 @@ 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
diff --git a/vim/compiler/perlcritic.vim b/vim/compiler/perlcritic.vim
index 381e0df3..39dcb46f 100644
--- a/vim/compiler/perlcritic.vim
+++ b/vim/compiler/perlcritic.vim
@@ -1,4 +1,4 @@
-if exists('current_compiler')
+if exists('g:current_compiler')
   finish
 endif
 let g:current_compiler = 'tidy'
diff --git a/vim/compiler/vint.vim b/vim/compiler/vint.vim
index 35a4372e..1fbe3b62 100644
--- a/vim/compiler/vint.vim
+++ b/vim/compiler/vint.vim
@@ -1,4 +1,4 @@
-if exists('current_compiler')
+if exists('g:current_compiler')
   finish
 endif
 let g:current_compiler = 'vimlint'
-- 
cgit v1.2.3