Merge pull request #135 from tbelaire/patch-1
astylerc not actually passing correct file
This commit is contained in:
commit
aaf19a31a9
@ -53,7 +53,7 @@ endif
|
|||||||
" C#
|
" C#
|
||||||
if !exists('g:formatdef_astyle_cs')
|
if !exists('g:formatdef_astyle_cs')
|
||||||
if filereadable('.astylerc')
|
if filereadable('.astylerc')
|
||||||
let g:formatdef_astyle_cs = '"astyle --mode=cs --options=.astyle"'
|
let g:formatdef_astyle_cs = '"astyle --mode=cs --options=.astylerc"'
|
||||||
elseif filereadable(expand('~/.astylerc')) || exists('$ARTISTIC_STYLE_OPTIONS')
|
elseif filereadable(expand('~/.astylerc')) || exists('$ARTISTIC_STYLE_OPTIONS')
|
||||||
let g:formatdef_astyle_cs = '"astyle --mode=cs"'
|
let g:formatdef_astyle_cs = '"astyle --mode=cs"'
|
||||||
else
|
else
|
||||||
@ -82,7 +82,7 @@ endfunction
|
|||||||
" C
|
" C
|
||||||
if !exists('g:formatdef_astyle_c')
|
if !exists('g:formatdef_astyle_c')
|
||||||
if filereadable('.astylerc')
|
if filereadable('.astylerc')
|
||||||
let g:formatdef_astyle_c = '"astyle --mode=c --options=.astyle"'
|
let g:formatdef_astyle_c = '"astyle --mode=c --options=.astylerc"'
|
||||||
elseif filereadable(expand('~/.astylerc')) || exists('$ARTISTIC_STYLE_OPTIONS')
|
elseif filereadable(expand('~/.astylerc')) || exists('$ARTISTIC_STYLE_OPTIONS')
|
||||||
let g:formatdef_astyle_c = '"astyle --mode=c"'
|
let g:formatdef_astyle_c = '"astyle --mode=c"'
|
||||||
else
|
else
|
||||||
@ -98,7 +98,7 @@ endif
|
|||||||
" C++
|
" C++
|
||||||
if !exists('g:formatdef_astyle_cpp')
|
if !exists('g:formatdef_astyle_cpp')
|
||||||
if filereadable('.astylerc')
|
if filereadable('.astylerc')
|
||||||
let g:formatdef_astyle_cpp = '"astyle --mode=c --options=.astyle"'
|
let g:formatdef_astyle_cpp = '"astyle --mode=c --options=.astylerc"'
|
||||||
elseif filereadable(expand('~/.astylerc')) || exists('$ARTISTIC_STYLE_OPTIONS')
|
elseif filereadable(expand('~/.astylerc')) || exists('$ARTISTIC_STYLE_OPTIONS')
|
||||||
let g:formatdef_astyle_cpp = '"astyle --mode=c"'
|
let g:formatdef_astyle_cpp = '"astyle --mode=c"'
|
||||||
else
|
else
|
||||||
@ -120,7 +120,7 @@ endif
|
|||||||
" Java
|
" Java
|
||||||
if !exists('g:formatdef_astyle_java')
|
if !exists('g:formatdef_astyle_java')
|
||||||
if filereadable('.astylerc')
|
if filereadable('.astylerc')
|
||||||
let g:formatdef_astyle_java = '"astyle --mode=java --options=.astyle"'
|
let g:formatdef_astyle_java = '"astyle --mode=java --options=.astylerc"'
|
||||||
elseif filereadable(expand('~/.astylerc')) || exists('$ARTISTIC_STYLE_OPTIONS')
|
elseif filereadable(expand('~/.astylerc')) || exists('$ARTISTIC_STYLE_OPTIONS')
|
||||||
let g:formatdef_astyle_java = '"astyle --mode=java"'
|
let g:formatdef_astyle_java = '"astyle --mode=java"'
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user