1 files changed, 26 insertions, 23 deletions
diff --git a/vim/after/ftplugin/vim/lint.vim b/vim/after/ftplugin/vim/lint.vim
index ef04d852..1e4f7d39 100644
--- a/vim/after/ftplugin/vim/lint.vim
+++ b/vim/after/ftplugin/vim/lint.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_vim_lint') || &compatible
+" vim/lint.vim: Use Vint to lint VimL scripts
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
   finish
 endif
-let b:did_ftplugin_vim_lint = 1
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:did_ftplugin_vim_lint'
+
+" Don't load if already loaded
+if exists('b:did_ftplugin_vim_lint')
+  finish
 endif
 
-" Build function for checker
+" Flag as loaded
+let b:did_ftplugin_vim_lint = 1
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|unlet b:did_ftplugin_vim_lint'
+
+" Build function for linter
 function! s:VimLint()
-  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 vint
-  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
 
 " Stop here if the user doesn't want ftplugin mappings
@@ -30,18 +37,14 @@ endif
 nnoremap <buffer> <silent> <unique>
       \ <Plug>VimLint
       \ :<C-U>call <SID>VimLint()<CR>
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|nunmap <buffer> <Plug>VimLint'
-endif
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|nunmap <buffer> <Plug>VimLint'
 
 " If there isn't a key mapping already, use a default one
 if !hasmapto('<Plug>VimLint')
   nmap <buffer> <unique>
         \ <LocalLeader>l
         \ <Plug>VimLint
-  if exists('b:undo_ftplugin')
-    let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|nunmap <buffer> <LocalLeader>l'
-  endif
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <LocalLeader>l'
 endif