3 files changed, 116 insertions, 105 deletions
diff --git a/vim/after/ftplugin/perl/check.vim b/vim/after/ftplugin/perl/check.vim
index df90784f..e115b37f 100644
--- a/vim/after/ftplugin/perl/check.vim
+++ b/vim/after/ftplugin/perl/check.vim
@@ -1,49 +1,50 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled
-if exists('b:did_ftplugin_perl_check') || &compatible
+" perl/check.vim: Use Perl 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_perl_check = 1
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:did_ftplugin_perl_check'
-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
+" Don't load if already loaded
+if exists('b:did_ftplugin_perl_check')
+  finish
 endif
 
-" Set up a mapping for the checker, if we're allowed
-if !exists('g:no_plugin_maps') && !exists('g:no_perl_maps')
+" Flag as loaded
+let b:did_ftplugin_perl_check = 1
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|unlet b:did_ftplugin_perl_check'
 
-  " Define a mapping target
-  nnoremap <buffer> <silent> <unique>
-        \ <Plug>PerlCheck
-        \ :<C-U>call <SID>PerlCheck()<CR>
-  if exists('b:undo_ftplugin')
-    let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|nunmap <buffer> <Plug>PerlCheck'
+" Build function for checker
+function! s:PerlCheck()
+  if exists('b:current_compiler')
+    let l:save_compiler = b:current_compiler
   endif
-
-  " If there isn't a key mapping already, use a default one
-  if !hasmapto('<Plug>PerlCheck')
-    nmap <buffer> <unique>
-          \ <LocalLeader>c
-          \ <Plug>PerlCheck
-    if exists('b:undo_ftplugin')
-      let b:undo_ftplugin = b:undo_ftplugin
-            \ . '|nunmap <buffer> <LocalLeader>c'
-    endif
+  compiler perl
+  lmake!
+  lwindow
+  if exists('l:save_compiler')
+    execute 'compiler ' . l:save_compiler
   endif
+endfunction
+
+" Stop here if the user doesn't want ftplugin mappings
+if exists('g:no_plugin_maps') || exists('g:no_perl_maps')
+  finish
+endif
+
+" Define a mapping target
+nnoremap <buffer> <silent> <unique>
+      \ <Plug>PerlCheck
+      \ :<C-U>call <SID>PerlCheck()<CR>
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|nunmap <buffer> <Plug>PerlCheck'
 
+" If there isn't a key mapping already, use a default one
+if !hasmapto('<Plug>PerlCheck')
+  nmap <buffer> <unique>
+        \ <LocalLeader>c
+        \ <Plug>PerlCheck
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <LocalLeader>c'
 endif
diff --git a/vim/after/ftplugin/perl/lint.vim b/vim/after/ftplugin/perl/lint.vim
index 48b23091..3e73ac9a 100644
--- a/vim/after/ftplugin/perl/lint.vim
+++ b/vim/after/ftplugin/perl/lint.vim
@@ -1,49 +1,50 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled
-if exists('b:did_ftplugin_perl_lint') || &compatible
+" perl/lint.vim: Use Perl::Critic to lint scripts
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
   finish
 endif
-let b:did_ftplugin_perl_lint = 1
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:did_ftplugin_perl_lint'
-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
+" Don't load if already loaded
+if exists('b:did_ftplugin_perl_lint')
+  finish
 endif
 
-" Set up a mapping for the linter, if we're allowed
-if !exists('g:no_plugin_maps') && !exists('g:no_perl_maps')
+" Flag as loaded
+let b:did_ftplugin_perl_lint = 1
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|unlet b:did_ftplugin_perl_lint'
 
-  " Define a mapping target
-  nnoremap <buffer> <silent> <unique>
-        \ <Plug>PerlLint
-        \ :<C-U>call <SID>PerlLint()<CR>
-  if exists('b:undo_ftplugin')
-    let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|nunmap <buffer> <Plug>PerlLint'
+" Build function for linter
+function! s:PerlLint()
+  if exists('b:current_compiler')
+    let l:save_compiler = b:current_compiler
   endif
-
-  " If there isn't a key mapping already, use a default one
-  if !hasmapto('<Plug>PerlLint')
-    nmap <buffer> <unique>
-          \ <LocalLeader>l
-          \ <Plug>PerlLint
-    if exists('b:undo_ftplugin')
-      let b:undo_ftplugin = b:undo_ftplugin
-            \ . '|nunmap <buffer> <LocalLeader>l'
-    endif
+  compiler perlcritic
+  lmake!
+  lwindow
+  if exists('l:save_compiler')
+    execute 'compiler ' . l:save_compiler
   endif
+endfunction
+
+" Stop here if the user doesn't want ftplugin mappings
+if exists('g:no_plugin_maps') || exists('g:no_perl_maps')
+  finish
+endif
+
+" Define a mapping target
+nnoremap <buffer> <silent> <unique>
+      \ <Plug>PerlLint
+      \ :<C-U>call <SID>PerlLint()<CR>
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|nunmap <buffer> <Plug>PerlLint'
 
+" If there isn't a key mapping already, use a default one
+if !hasmapto('<Plug>PerlLint')
+  nmap <buffer> <unique>
+        \ <LocalLeader>l
+        \ <Plug>PerlLint
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <LocalLeader>l'
 endif
diff --git a/vim/after/ftplugin/perl/tidy.vim b/vim/after/ftplugin/perl/tidy.vim
index 18033a42..f6744f3a 100644
--- a/vim/after/ftplugin/perl/tidy.vim
+++ b/vim/after/ftplugin/perl/tidy.vim
@@ -1,35 +1,44 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled
-if exists('b:did_ftplugin_perl_tidy') || &compatible
+" perl/tidy.vim: Use Perl::Tidy to format and filter scripts
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
   finish
 endif
-let b:did_ftplugin_perl_tidy = 1
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:did_ftplugin_perl_tidy'
+
+" Don't load if already loaded
+if exists('b:did_ftplugin_perl_tidy')
+  finish
 endif
 
-" Set up a mapping for the tidier, if we're allowed
-if !exists('g:no_plugin_maps') && !exists('g:no_perl_maps')
+" Flag as loaded
+let b:did_ftplugin_perl_tidy = 1
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|unlet b:did_ftplugin_perl_tidy'
+
+" Plugin function
+function s:PerlTidy()
+  let l:view = winsaveview()
+  %!perltidy
+  call winrestview(l:view)
+endfunction
 
-  " Define a mapping target
-  nnoremap <buffer> <silent> <unique>
-        \ <Plug>PerlTidy
-        \ :<C-U>%!perltidy<CR>
-  if exists('b:undo_ftplugin')
-    let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|nunmap <buffer> <Plug>PerlTidy'
-  endif
+" Stop here if the user doesn't want ftplugin mappings
+if exists('g:no_plugin_maps') || exists('g:no_perl_maps')
+  finish
+endif
 
-  " If there isn't a key mapping already, use a default one
-  if !hasmapto('<Plug>PerlTidy')
-    nmap <buffer> <unique>
-          \ <LocalLeader>t
-          \ <Plug>PerlTidy
-    if exists('b:undo_ftplugin')
-      let b:undo_ftplugin = b:undo_ftplugin
-            \ . '|nunmap <buffer> <LocalLeader>t'
-    endif
-  endif
+" Define a mapping target
+nnoremap <buffer> <silent> <unique>
+      \ <Plug>PerlTidy
+      \ :<C-U>call <SID>PerlTidy()<CR>
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|nunmap <buffer> <Plug>PerlTidy'
 
+" If there isn't a key mapping already, use a default one
+if !hasmapto('<Plug>PerlTidy')
+  nmap <buffer> <unique>
+        \ <LocalLeader>t
+        \ <Plug>PerlTidy
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <LocalLeader>t'
 endif