forks/php.vim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changes php_sync_method variable name to php5_sync_method to avoid conflict with indent

Browse source
This commit is contained in:
Kristijan Husak 2014-02-06 11:43:51 +01:00
parent d30ecd69f8
commit 72bc107a50
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
syntax/php.template
View file

@ -36,7 +36,7 @@
" if there exists an open ( or [ without a closing one " if there exists an open ( or [ without a closing one
" php_no_shorttags = 1 don't sync <? ?> as php " php_no_shorttags = 1 don't sync <? ?> as php
" php_folding = 1 for folding classes and functions " php_folding = 1 for folding classes and functions
" php_sync_method = x " php5_sync_method = x
" x=-1 to sync by search ( default ) " x=-1 to sync by search ( default )
" x>0 to sync at least x lines backwards " x>0 to sync at least x lines backwards
" x=0 to sync from start " x=0 to sync from start
@ -78,11 +78,11 @@ unlet! b:current_syntax
syntax spell default syntax spell default
" Set sync method if none declared " Set sync method if none declared
if !exists("php_sync_method") if !exists("php5_sync_method")
if exists("php_minlines") if exists("php_minlines")
let php_sync_method=php_minlines let php5_sync_method=php_minlines
else else
let php_sync_method=-1 let php5_sync_method=-1
endif endif
endif endif
@ -296,13 +296,13 @@ elseif exists("php_folding") && php_folding==2
endif endif
" Sync " Sync
if php_sync_method==-1 if php5_sync_method==-1
syn sync match phpRegionSync grouphere phpRegion "^\s*<?\(php\)\=\s*$" syn sync match phpRegionSync grouphere phpRegion "^\s*<?\(php\)\=\s*$"
syn sync match phpRegionSync grouphere NONE "^\s*?>\s*$" syn sync match phpRegionSync grouphere NONE "^\s*?>\s*$"
syn sync match phpRegionSync grouphere NONE "^\s*%>\s*$" syn sync match phpRegionSync grouphere NONE "^\s*%>\s*$"
syn sync match phpRegionSync grouphere phpRegion "function\s.*(.*\$" syn sync match phpRegionSync grouphere phpRegion "function\s.*(.*\$"
elseif php_sync_method>0 elseif php5_sync_method>0
exec "syn sync minlines=" . php_sync_method exec "syn sync minlines=" . php5_sync_method
else else
exec "syn sync fromstart" exec "syn sync fromstart"
endif endif

14
syntax/php.vim
View file

@ -36,7 +36,7 @@
" if there exists an open ( or [ without a closing one " if there exists an open ( or [ without a closing one
" php_no_shorttags = 1 don't sync <? ?> as php " php_no_shorttags = 1 don't sync <? ?> as php
" php_folding = 1 for folding classes and functions " php_folding = 1 for folding classes and functions
" php_sync_method = x " php5_sync_method = x
" x=-1 to sync by search ( default ) " x=-1 to sync by search ( default )
" x>0 to sync at least x lines backwards " x>0 to sync at least x lines backwards
" x=0 to sync from start " x=0 to sync from start
@ -78,11 +78,11 @@ unlet! b:current_syntax
syntax spell default syntax spell default
" Set sync method if none declared " Set sync method if none declared
if !exists("php_sync_method") if !exists("php5_sync_method")
if exists("php_minlines") if exists("php_minlines")
let php_sync_method=php_minlines let php5_sync_method=php_minlines
else else
let php_sync_method=-1 let php5_sync_method=-1
endif endif
endif endif
@ -619,13 +619,13 @@ elseif exists("php_folding") && php_folding==2
endif endif
" Sync " Sync
if php_sync_method==-1 if php5_sync_method==-1
syn sync match phpRegionSync grouphere phpRegion "^\s*<?\(php\)\=\s*$" syn sync match phpRegionSync grouphere phpRegion "^\s*<?\(php\)\=\s*$"
syn sync match phpRegionSync grouphere NONE "^\s*?>\s*$" syn sync match phpRegionSync grouphere NONE "^\s*?>\s*$"
syn sync match phpRegionSync grouphere NONE "^\s*%>\s*$" syn sync match phpRegionSync grouphere NONE "^\s*%>\s*$"
syn sync match phpRegionSync grouphere phpRegion "function\s.*(.*\$" syn sync match phpRegionSync grouphere phpRegion "function\s.*(.*\$"
elseif php_sync_method>0 elseif php5_sync_method>0
exec "syn sync minlines=" . php_sync_method exec "syn sync minlines=" . php5_sync_method
else else
exec "syn sync fromstart" exec "syn sync fromstart"
endif endif