From 72bc107a5018c5c6701a6ac6fa14be8e309f6574 Mon Sep 17 00:00:00 2001
From: Kristijan Husak <kristijan.husak@keeponapps.com>
Date: Thu, 6 Feb 2014 11:43:51 +0100
Subject: [PATCH] changes php_sync_method variable name to php5_sync_method to
 avoid conflict with indent

---
 syntax/php.template | 14 +++++++-------
 syntax/php.vim      | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

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