From bb647dca1516a45ce18f2e040bd20528f588e2fe Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 3 Mar 2014 00:41:25 +0900
Subject: Kate syntax highlighting files update - Feb 2014

---
 kate/data/javascript-php.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'kate/data/javascript-php.xml')

diff --git a/kate/data/javascript-php.xml b/kate/data/javascript-php.xml
index b1c58bdad..d61b07663 100644
--- a/kate/data/javascript-php.xml
+++ b/kate/data/javascript-php.xml
@@ -9,7 +9,7 @@
 
 
 
-<language name="JavaScript/PHP" hidden="true" version="1.23" kateversion="2.5" section="Other" extensions=""
+<language name="JavaScript/PHP" hidden="true" version="1.22" kateversion="2.4" section="Other" extensions=""
           mimetype="" indenter="cstyle"
           author="Anders Lund (anders@alweb.dk), Joseph Wenninger (jowenn@kde.org), Whitehawk Stormchaser (zerokode@gmx.net)" license="">
   <highlighting>
@@ -109,17 +109,14 @@
         <AnyChar attribute="Symbol" String=":!%&amp;+,-/.*&lt;=&gt;?|~^&#59;" />
       </context>
 
-      <context attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop" name="Object Member">
+      <context attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop" name="Object Member">
 <IncludeRules context="FindPHP" />
         <DetectChar char="." />
         <!--DetectIdentifier-->
         <RegExpr attribute="Objects" context="Object Member" String="[a-zA-Z_$][\w$]*(?=\s*\.)" />
         <!--DetectIdentifier-->
         <RegExpr attribute="Object Member" String="[a-zA-Z_$][\w$]*" />
-        <!-- NoRegExp without DetectSpaces. TODO: code reuse without detecting spaces as object member? -->
-        <Detect2Chars context="#pop" lookAhead="true" char="/" char1="/" />
-        <Detect2Chars context="#pop" lookAhead="true" char="/" char1="*" />
-        <DetectChar context="#pop" char="/" />
+        <IncludeRules context="NoRegExp" />
       </context>
 
       <context attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop" name="NoRegExp">
-- 
cgit v1.2.1