Merge pull request #227 from mschulkind/master

Stop clobbering global variables
This commit is contained in:
Martin Grenfell 2012-04-20 07:15:30 -07:00
commit 5c7f2b800d

View File

@ -531,10 +531,10 @@ endfunction
" 'subtype' - all errors will be assigned the given subtype " 'subtype' - all errors will be assigned the given subtype
function! SyntasticMake(options) function! SyntasticMake(options)
let old_loclist = getloclist(0) let old_loclist = getloclist(0)
let old_makeprg = &makeprg let old_makeprg = &l:makeprg
let old_shellpipe = &shellpipe let old_shellpipe = &shellpipe
let old_shell = &shell let old_shell = &shell
let old_errorformat = &errorformat let old_errorformat = &l:errorformat
if !s:running_windows && (s:uname !~ "FreeBSD") if !s:running_windows && (s:uname !~ "FreeBSD")
"this is a hack to stop the screen needing to be ':redraw'n when "this is a hack to stop the screen needing to be ':redraw'n when
@ -544,19 +544,19 @@ function! SyntasticMake(options)
endif endif
if has_key(a:options, 'makeprg') if has_key(a:options, 'makeprg')
let &makeprg = a:options['makeprg'] let &l:makeprg = a:options['makeprg']
endif endif
if has_key(a:options, 'errorformat') if has_key(a:options, 'errorformat')
let &errorformat = a:options['errorformat'] let &l:errorformat = a:options['errorformat']
endif endif
silent lmake! silent lmake!
let errors = getloclist(0) let errors = getloclist(0)
call setloclist(0, old_loclist) call setloclist(0, old_loclist)
let &makeprg = old_makeprg let &l:makeprg = old_makeprg
let &errorformat = old_errorformat let &l:errorformat = old_errorformat
let &shellpipe=old_shellpipe let &shellpipe=old_shellpipe
let &shell=old_shell let &shell=old_shell