Merge remote-tracking branch 'scrooloose/master'

Conflicts:
	syntax_checkers/ruby.vim
This commit is contained in:
Chris Hoffman 2011-02-10 05:37:03 -06:00
commit 6a19ae4ee0

View File

@ -20,12 +20,18 @@ if !exists('g:ruby_path') && !executable("ruby")
endif
function! SyntaxCheckers_ruby_GetLocList()
if exists('g:ruby_path')
let makeprg = 'RUBYOPT= '.g:ruby_path.' -W1 -c '.shellescape(expand('%'))
if has('win32') || has('win64')
let rubyopt = 'RUBYOPT= '
else
let makeprg = 'RUBYOPT= ruby -W1 -c '.shellescape(expand('%'))
let rubyopt = ''
endif
let errorformat = '%-GSyntax OK,%E%f:%l: syntax error\, %m,%Z%p^,%W%f:%l: warning: %m,%Z%p^,%-C%.%#'
return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
if exists('g:ruby_path')
let makeprg = rubyopt.g:ruby_path.' -W1 -c '.shellescape(expand('%'))
else
let makeprg = rubyopt.'ruby -W1 -c '.shellescape(expand('%'))
endif
let errorformat = '%-GSyntax OK,%E%f:%l: syntax error\, %m,%Z%p^,%W%f:%l: warning: %m,%Z%p^,%W%f:%l: %m,%-C%.%#'
return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
endfunction