From 30d74622495e708ae0fcb57f46c13797c30edec5 Mon Sep 17 00:00:00 2001 From: Hong Xu Date: Tue, 8 May 2012 20:31:20 +0800 Subject: [PATCH] Remove some unnecessary win64 checks. has('win32') is always true on Win64. --- autoload/syntastic/c.vim | 2 +- plugin/syntastic.vim | 2 +- syntax_checkers/eruby.vim | 2 +- syntax_checkers/ruby/mri.vim | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autoload/syntastic/c.vim b/autoload/syntastic/c.vim index 49f7099e..8d329490 100644 --- a/autoload/syntastic/c.vim +++ b/autoload/syntastic/c.vim @@ -128,7 +128,7 @@ function! syntastic#c#SearchHeaders() " search included headers for hfile in files if hfile != '' - let filename = expand('%:p:h') . ((has('win32') || has('win64')) ? + let filename = expand('%:p:h') . (has('win32') ? \ '\' : '/') . hfile try let lines = readfile(filename, '', 100) diff --git a/plugin/syntastic.vim b/plugin/syntastic.vim index 21f368dd..39e9a55a 100644 --- a/plugin/syntastic.vim +++ b/plugin/syntastic.vim @@ -17,7 +17,7 @@ if exists("g:loaded_syntastic_plugin") endif let g:loaded_syntastic_plugin = 1 -let s:running_windows = has("win16") || has("win32") || has("win64") +let s:running_windows = has("win16") || has("win32") if !s:running_windows let s:uname = system('uname') diff --git a/syntax_checkers/eruby.vim b/syntax_checkers/eruby.vim index fcff063e..52cec3a3 100644 --- a/syntax_checkers/eruby.vim +++ b/syntax_checkers/eruby.vim @@ -20,7 +20,7 @@ if !executable("ruby") || !executable("cat") endif function! SyntaxCheckers_eruby_GetLocList() - if has('win32') || has('win64') + if has('win32') let makeprg='sed "s/<\%=/<\%/g" '. shellescape(expand("%")) . ' \| ruby -e "require \"erb\"; puts ERB.new(ARGF.read, nil, \"-\").src" \| ruby -c' else let makeprg='sed "s/<\%=/<\%/g" '. shellescape(expand("%")) . ' \| RUBYOPT= ruby -e "require \"erb\"; puts ERB.new(ARGF.read, nil, \"-\").src" \| RUBYOPT= ruby -c' diff --git a/syntax_checkers/ruby/mri.vim b/syntax_checkers/ruby/mri.vim index 50a8a117..ee72b5a0 100644 --- a/syntax_checkers/ruby/mri.vim +++ b/syntax_checkers/ruby/mri.vim @@ -11,7 +11,7 @@ "============================================================================ function! SyntaxCheckers_ruby_GetLocList() " we cannot set RUBYOPT on windows like that - if has('win32') || has('win64') + if has('win32') let makeprg = 'ruby -W1 -T1 -c '.shellescape(expand('%')) else let makeprg = 'RUBYOPT= ruby -W1 -c '.shellescape(expand('%'))