Updated plugins

sources_non_forked/syntastic/syntax_checkers/c/cppcheck.vim

@@ -28,6 +28,10 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
+function! SyntaxCheckers_c_cppcheck_Preprocess(errors)
+    return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
+endfunction
+
 function! SyntaxCheckers_c_cppcheck_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'args': syntastic#c#ReadConfig(g:syntastic_cppcheck_config_file),
@@ -46,6 +50,7 @@ function! SyntaxCheckers_c_cppcheck_GetLocList() dict
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'preprocess': 'SyntaxCheckers_c_cppcheck_Preprocess',
         \ 'returns': [0] })
 
     for e in loclist

sources_non_forked/syntastic/syntax_checkers/c/gcc.vim

@@ -15,10 +15,6 @@ if exists('g:loaded_syntastic_c_gcc_checker')
 endif
 let g:loaded_syntastic_c_gcc_checker = 1
 
-if !exists('g:syntastic_c_compiler')
-    let g:syntastic_c_compiler = executable('gcc') ? 'gcc' : 'clang'
-endif
-
 if !exists('g:syntastic_c_compiler_options')
     let g:syntastic_c_compiler_options = '-std=gnu99'
 endif
@@ -27,6 +23,9 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_c_gcc_IsAvailable() dict
+    if !exists('g:syntastic_c_compiler')
+        let g:syntastic_c_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
+    endif
     return executable(expand(g:syntastic_c_compiler))
 endfunction
 

sources_non_forked/syntastic/syntax_checkers/cpp/cppcheck.vim

@@ -21,48 +21,11 @@ if exists("g:loaded_syntastic_cpp_cppcheck_checker")
 endif
 let g:loaded_syntastic_cpp_cppcheck_checker = 1
 
-if !exists('g:syntastic_cppcheck_config_file')
-    let g:syntastic_cppcheck_config_file = '.syntastic_cppcheck_config'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cpp_cppcheck_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': syntastic#c#ReadConfig(g:syntastic_cppcheck_config_file),
-        \ 'args_after': '-q --enable=style' })
-
-    let errorformat =
-        \ '[%f:%l]: (%trror) %m,' .
-        \ '[%f:%l]: (%tarning) %m,' .
-        \ '[%f:%l]: (%ttyle) %m,' .
-        \ '[%f:%l]: (%terformance) %m,' .
-        \ '[%f:%l]: (%tortability) %m,' .
-        \ '[%f:%l]: (%tnformation) %m,' .
-        \ '[%f:%l]: (%tnconclusive) %m,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0] })
-
-    for e in loclist
-        if e['type'] =~? '\m^[SPI]'
-            let e['type'] = 'w'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
+runtime! syntax_checkers/c/*.vim
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
-    \ 'name': 'cppcheck'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
+    \ 'name': 'cppcheck',
+    \ 'redirect': 'c/cppcheck'})
 
 " vim: set et sts=4 sw=4:

sources_non_forked/syntastic/syntax_checkers/cpp/gcc.vim

@@ -15,10 +15,6 @@ if exists('g:loaded_syntastic_cpp_gcc_checker')
 endif
 let g:loaded_syntastic_cpp_gcc_checker = 1
 
-if !exists('g:syntastic_cpp_compiler')
-    let g:syntastic_cpp_compiler = executable('g++') ? 'g++' : 'clang++'
-endif
-
 if !exists('g:syntastic_cpp_compiler_options')
     let g:syntastic_cpp_compiler_options = ''
 endif
@@ -27,6 +23,9 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_cpp_gcc_IsAvailable() dict
+    if !exists('g:syntastic_cpp_compiler')
+        let g:syntastic_cpp_compiler = executable(self.getExec()) ? self.getExec() : 'clang++'
+    endif
     return executable(expand(g:syntastic_cpp_compiler))
 endfunction
 
@@ -47,7 +46,8 @@ endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
-    \ 'name': 'gcc' })
+    \ 'name': 'gcc',
+    \ 'exec': 'g++' })
 
 let &cpo = s:save_cpo
 unlet s:save_cpo

sources_non_forked/syntastic/syntax_checkers/erlang/syntaxerl.vim

@@ -0,0 +1,40 @@
+"============================================================================
+"File:        syntaxerl.vim
+"Description: Syntax checking plugin for syntastic.
+"Maintainer:  locojay
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists("g:loaded_syntastic_erlang_syntaxerl_checker")
+    finish
+endif
+
+let g:loaded_syntastic_erlang_syntaxerl_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! SyntaxCheckers_erlang_syntaxerl_GetLocList() dict
+
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%W%f:%l: warning: %m,'.
+        \ '%E%f:%l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'erlang',
+    \ 'name': 'syntaxerl'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo

sources_non_forked/syntastic/syntax_checkers/eruby/ruby.vim

@@ -15,19 +15,18 @@ if exists("g:loaded_syntastic_eruby_ruby_checker")
 endif
 let g:loaded_syntastic_eruby_ruby_checker = 1
 
-if !exists("g:syntastic_ruby_exec")
-    let g:syntastic_ruby_exec = "ruby"
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_eruby_ruby_IsAvailable() dict
+    if !exists("g:syntastic_ruby_exec")
+        let g:syntastic_ruby_exec = self.getExec()
+    endif
     return executable(expand(g:syntastic_ruby_exec))
 endfunction
 
 function! SyntaxCheckers_eruby_ruby_GetLocList() dict
-    let exe = expand(g:syntastic_ruby_exec)
+    let exe = syntastic#util#shexpand(g:syntastic_ruby_exec)
     if !syntastic#util#isRunningWindows()
         let exe = 'RUBYOPT= ' . exe
     endif
@@ -35,7 +34,7 @@ function! SyntaxCheckers_eruby_ruby_GetLocList() dict
     let fname = "'" . escape(expand('%'), "\\'") . "'"
 
     " TODO: encodings became useful in ruby 1.9 :)
-    if syntastic#util#versionIsAtLeast(syntastic#util#getVersion('ruby --version'), [1, 9])
+    if syntastic#util#versionIsAtLeast(syntastic#util#getVersion(exe . ' --version'), [1, 9])
         let enc = &fileencoding != '' ? &fileencoding : &encoding
         let encoding_spec = ', :encoding => "' . (enc ==? 'utf-8' ? 'UTF-8' : 'BINARY') . '"'
     else

sources_non_forked/syntastic/syntax_checkers/go/go.vim

@@ -50,11 +50,15 @@ function! SyntaxCheckers_go_go_GetLocList() dict
     " compiled by `go build`, therefore `go test` must be called for those.
     if match(expand('%'), '\m_test\.go$') == -1
         let makeprg = 'go build ' . syntastic#c#NullOutput()
+        let cleanup = 0
     else
         let makeprg = 'go test -c ' . syntastic#c#NullOutput()
+        let cleanup = 1
     endif
 
+    " The first pattern is for warnings from C compilers.
     let errorformat =
+        \ '%W%f:%l: warning: %m,' .
         \ '%E%f:%l:%c:%m,' .
         \ '%E%f:%l:%m,' .
         \ '%C%\s%\+%m,' .
@@ -70,6 +74,10 @@ function! SyntaxCheckers_go_go_GetLocList() dict
         \ 'cwd': expand('%:p:h'),
         \ 'defaults': {'type': 'e'} })
 
+    if cleanup
+        call delete(expand('%:p:h') . syntastic#util#Slash() . expand('%:p:h:t') . '.test')
+    endif
+
     return errors
 endfunction
 

sources_non_forked/syntastic/syntax_checkers/haml/haml.vim

@@ -15,20 +15,19 @@ if exists('g:loaded_syntastic_haml_haml_checker')
 endif
 let g:loaded_syntastic_haml_haml_checker = 1
 
-if !exists('g:syntastic_haml_interpreter')
-    let g:syntastic_haml_interpreter = 'haml'
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_haml_haml_IsAvailable() dict
+    if !exists('g:syntastic_haml_interpreter')
+        let g:syntastic_haml_interpreter = self.getExec()
+    endif
     return executable(expand(g:syntastic_haml_interpreter))
 endfunction
 
 function! SyntaxCheckers_haml_haml_GetLocList() dict
     let makeprg = self.makeprgBuild({
-        \ 'exe': expand(g:syntastic_haml_interpreter),
+        \ 'exe': syntastic#util#shexpand(g:syntastic_haml_interpreter),
         \ 'args_after': '-c' })
 
     let errorformat =

sources_non_forked/syntastic/syntax_checkers/java/javac.vim

@@ -226,7 +226,7 @@ function! s:GetMavenProperties()
     let pom = findfile("pom.xml", ".;")
     if s:has_maven && filereadable(pom)
         if !has_key(g:syntastic_java_javac_maven_pom_properties, pom)
-            let mvn_cmd = expand(g:syntastic_java_maven_executable) . ' -f ' . pom
+            let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) . ' -f ' . pom
             let mvn_is_managed_tag = 1
             let mvn_settings_output = split(system(mvn_cmd . ' help:effective-pom'), "\n")
             let current_path = 'project'
@@ -265,7 +265,7 @@ function! s:GetMavenClasspath()
     let pom = findfile("pom.xml", ".;")
     if s:has_maven && filereadable(pom)
         if !has_key(g:syntastic_java_javac_maven_pom_ftime, pom) || g:syntastic_java_javac_maven_pom_ftime[pom] != getftime(pom)
-            let mvn_cmd = expand(g:syntastic_java_maven_executable) . ' -f ' . pom
+            let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) . ' -f ' . pom
             let mvn_classpath_output = split(system(mvn_cmd . ' dependency:build-classpath'), "\n")
             let mvn_classpath = ''
             let class_path_next = 0

sources_non_forked/syntastic/syntax_checkers/javascript/jshint.vim

@@ -14,10 +14,6 @@ if exists('g:loaded_syntastic_javascript_jshint_checker')
 endif
 let g:loaded_syntastic_javascript_jshint_checker = 1
 
-if !exists('g:syntastic_jshint_exec')
-    let g:syntastic_jshint_exec = 'jshint'
-endif
-
 if !exists('g:syntastic_javascript_jshint_conf')
     let g:syntastic_javascript_jshint_conf = ''
 endif
@@ -26,17 +22,21 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_javascript_jshint_IsAvailable() dict
+    if !exists('g:syntastic_jshint_exec')
+        let g:syntastic_jshint_exec = self.getExec()
+    endif
     return executable(expand(g:syntastic_jshint_exec))
 endfunction
 
 function! SyntaxCheckers_javascript_jshint_GetLocList() dict
+    let exe = syntastic#util#shexpand(g:syntastic_jshint_exec)
     if !exists('s:jshint_new')
         let s:jshint_new =
-            \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(expand(g:syntastic_jshint_exec) . ' --version'), [1, 1])
+            \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(exe . ' --version'), [1, 1])
     endif
 
     let makeprg = self.makeprgBuild({
-        \ 'exe': expand(g:syntastic_jshint_exec),
+        \ 'exe': exe,
         \ 'args': (g:syntastic_javascript_jshint_conf != '' ? '--config ' . g:syntastic_javascript_jshint_conf : ''),
         \ 'args_after': (s:jshint_new ? '--verbose ' : '') })
 

sources_non_forked/syntastic/syntax_checkers/less/lessc.vim

@@ -33,17 +33,17 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
-if g:syntastic_less_use_less_lint
-    let s:check_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h') . syntastic#util#Slash() . 'less-lint.js')
-else
-    let s:check_file = 'lessc'
-endif
+let s:node_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h') . syntastic#util#Slash() . 'less-lint.js')
 
 function! SyntaxCheckers_less_lessc_IsAvailable() dict
-    return g:syntastic_less_use_less_lint ? executable('node') : executable('lessc')
+    return g:syntastic_less_use_less_lint ? executable('node') : executable(self.getExec())
 endfunction
 
 function! SyntaxCheckers_less_lessc_GetLocList() dict
+    if !exists('s:check_file')
+        let s:check_file = g:syntastic_less_use_less_lint ? s:node_file : self.getExecEscaped()
+    endif
+
     let makeprg = self.makeprgBuild({
         \ 'exe': s:check_file,
         \ 'args': g:syntastic_less_options,

sources_non_forked/syntastic/syntax_checkers/objc/gcc.vim

@@ -15,10 +15,6 @@ if exists('g:loaded_syntastic_objc_gcc_checker')
 endif
 let g:loaded_syntastic_objc_gcc_checker = 1
 
-if !exists('g:syntastic_objc_compiler')
-    let g:syntastic_objc_compiler = executable('gcc') ? 'gcc' : 'clang'
-endif
-
 if !exists('g:syntastic_objc_compiler_options')
     let g:syntastic_objc_compiler_options = '-std=gnu99'
 endif
@@ -27,6 +23,9 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_objc_gcc_IsAvailable() dict
+    if !exists('g:syntastic_objc_compiler')
+        let g:syntastic_objc_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
+    endif
     return executable(expand(g:syntastic_objc_compiler))
 endfunction
 

sources_non_forked/syntastic/syntax_checkers/objcpp/gcc.vim

@@ -15,10 +15,6 @@ if exists('g:loaded_syntastic_objcpp_gcc_checker')
 endif
 let g:loaded_syntastic_objcpp_gcc_checker = 1
 
-if !exists('g:syntastic_objcpp_compiler')
-    let g:syntastic_objcpp_compiler = executable('gcc') ? 'gcc' : 'clang'
-endif
-
 if !exists('g:syntastic_objcpp_compiler_options')
     let g:syntastic_objcpp_compiler_options = '-std=gnu99'
 endif
@@ -27,6 +23,9 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_objcpp_gcc_IsAvailable() dict
+    if !exists('g:syntastic_c_compiler')
+        let g:syntastic_objcpp_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
+    endif
     return executable(expand(g:syntastic_objcpp_compiler))
 endfunction
 

sources_non_forked/syntastic/syntax_checkers/perl/perl.vim

@@ -40,7 +40,7 @@ set cpo&vim
 function! SyntaxCheckers_perl_perl_IsAvailable() dict
     " don't call executable() here, to allow things like
     " let g:syntastic_perl_interpreter='/usr/bin/env perl'
-    silent! call system(expand(g:syntastic_perl_interpreter) . ' -e ' . syntastic#util#shescape('exit(0)'))
+    silent! call system(syntastic#util#shexpand(g:syntastic_perl_interpreter) . ' -e ' . syntastic#util#shescape('exit(0)'))
     return v:shell_error == 0
 endfunction
 
@@ -63,7 +63,7 @@ function! SyntaxCheckers_perl_perl_GetLocList() dict
         call syntastic#log#deprecationWarn('variable g:syntastic_perl_lib_path should be a list')
         let includes = split(g:syntastic_perl_lib_path, ',')
     else
-        let includes = copy(exists('b:syntastic_perl_lib_path') ? b:syntastic_perl_lib_path : g:syntastic_perl_lib_path)
+        let includes = copy(syntastic#util#var('perl_lib_path'))
     endif
     let shebang = syntastic#util#parseShebang()
     let extra = join(map(includes, '"-I" . v:val')) .

sources_non_forked/syntastic/syntax_checkers/php/phpmd.vim

@@ -58,7 +58,9 @@ function! SyntaxCheckers_php_phpmd_GetHighlightRegex(item)
 endfunction
 
 function! SyntaxCheckers_php_phpmd_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'post_args_before': 'text codesize,design,unusedcode,naming' })
+    let makeprg = self.makeprgBuild({
+        \ 'post_args_before': 'text',
+        \ 'post_args': 'codesize,design,unusedcode,naming' })
 
     let errorformat = '%E%f:%l%\s%#%m'
 

sources_non_forked/syntastic/syntax_checkers/puppet/puppetlint.vim

@@ -26,9 +26,9 @@ endif
 function! SyntaxCheckers_puppet_puppetlint_IsAvailable() dict
     return
         \ executable("puppet") &&
-        \ executable("puppet-lint") &&
-        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion('puppet-lint --version 2>' .
-        \     syntastic#util#DevNull()), [0,1,10])
+        \ executable(self.getExec()) &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+        \       self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull()), [0,1,10])
 endfunction
 
 function! SyntaxCheckers_puppet_puppetlint_GetLocList() dict

sources_non_forked/syntastic/syntax_checkers/ruby/mri.vim

@@ -15,10 +15,6 @@ if exists("g:loaded_syntastic_ruby_mri_checker")
 endif
 let g:loaded_syntastic_ruby_mri_checker = 1
 
-if !exists("g:syntastic_ruby_exec")
-    let g:syntastic_ruby_exec = "ruby"
-endif
-
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -32,7 +28,11 @@ function! SyntaxCheckers_ruby_mri_GetHighlightRegex(i)
 endfunction
 
 function! SyntaxCheckers_ruby_mri_GetLocList() dict
-    let exe = expand(g:syntastic_ruby_exec)
+    if !exists('g:syntastic_ruby_exec')
+        let g:syntastic_ruby_exec = self.getExec()
+    endif
+
+    let exe = syntastic#util#shexpand(g:syntastic_ruby_exec)
     if !syntastic#util#isRunningWindows()
         let exe = 'RUBYOPT= ' . exe
     endif

sources_non_forked/syntastic/syntax_checkers/scss/scss_lint.vim

@@ -17,13 +17,21 @@ let g:loaded_syntastic_scss_scss_lint_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
+function! SyntaxCheckers_scss_scss_lint_IsAvailable() dict
+    return
+        \ executable(self.getExec()) &&
+        \ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+        \       self.getExecEscaped() . ' --version'), [0, 12])
+endfunction
+
 function! SyntaxCheckers_scss_scss_lint_GetLocList() dict
     let makeprg = self.makeprgBuild({})
     let errorformat = '%f:%l [%t] %m'
     return SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
-        \ 'subtype': 'Style'})
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1, 65] })
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({

sources_non_forked/syntastic/syntax_checkers/slim/slimrb.vim

@@ -18,17 +18,15 @@ let g:loaded_syntastic_slim_slimrb_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-function! s:SlimrbVersion()
-    if !exists('s:slimrb_version')
-        let s:slimrb_version = syntastic#util#getVersion('slimrb --version 2>' . syntastic#util#DevNull())
-    endif
-    return s:slimrb_version
-endfunction
-
 function! SyntaxCheckers_slim_slimrb_GetLocList() dict
+    if !exists('s:slimrb_new')
+        let s:slimrb_new = syntastic#util#versionIsAtLeast(syntastic#util#getVersion(
+            \ self.getExecEscaped() . ' --version 2>'. syntastic#util#DevNull()), [1, 3, 1])
+    endif
+
     let makeprg = self.makeprgBuild({ 'args_after': '-c' })
 
-    if syntastic#util#versionIsAtLeast(s:SlimrbVersion(), [1,3,1])
+    if s:slimrb_new
         let errorformat =
             \ '%C\ %#%f\, Line %l\, Column %c,'.
             \ '%-G\ %.%#,'.

sources_non_forked/syntastic/syntax_checkers/vim/vimlint.vim

@@ -80,7 +80,7 @@ function! s:vimlintOutput(filename, pos, ev, eid, mes, obj)
         \ 'vcol': 0,
         \ 'type': a:ev[0],
         \ 'text': '[' . a:eid . '] ' . a:mes,
-        \ 'valid': 1 })
+        \ 'valid': a:pos.lnum > 0 })
 endfunction
 " @vimlint(EVL103, 0, a:filename)
 

sources_non_forked/syntastic/syntax_checkers/yaml/yamlxs.vim

@@ -16,10 +16,6 @@ if exists("g:loaded_syntastic_yaml_yamlxs_checker")
 endif
 let g:loaded_syntastic_yaml_yamlxs_checker = 1
 
-if !exists('g:syntastic_perl_interpreter')
-    let g:syntastic_perl_interpreter = 'perl'
-endif
-
 if !exists('g:syntastic_perl_lib_path')
     let g:syntastic_perl_lib_path = []
 endif
@@ -28,6 +24,10 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 function! SyntaxCheckers_yaml_yamlxs_IsAvailable() dict
+    if !exists('g:syntastic_perl_interpreter')
+        let g:syntastic_perl_interpreter = self.getExec()
+    endif
+
     " don't call executable() here, to allow things like
     " let g:syntastic_perl_interpreter='/usr/bin/env perl'
     silent! call system(s:Exe() . ' ' . s:Modules() . ' -e ' . syntastic#util#shescape('exit(0)'))
@@ -54,7 +54,7 @@ function! SyntaxCheckers_yaml_yamlxs_GetLocList() dict
 endfunction
 
 function! s:Exe()
-    return expand(g:syntastic_perl_interpreter)
+    return syntastic#util#shexpand(g:syntastic_perl_interpreter)
 endfunction
 
 function s:Modules()
@@ -62,7 +62,7 @@ function s:Modules()
         call syntastic#log#deprecationWarn('variable g:syntastic_perl_lib_path should be a list')
         let includes = split(g:syntastic_perl_lib_path, ',')
     else
-        let includes = copy(exists('b:syntastic_perl_lib_path') ? b:syntastic_perl_lib_path : g:syntastic_perl_lib_path)
+        let includes = copy(syntastic#util#var('perl_lib_path'))
     endif
     return join(map(includes, '"-I" . v:val') + ['-MYAML::XS'])
 endfunction