diff options
| author | Darrell Anderson <[email protected]> | 2014-03-03 23:13:48 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2014-03-03 23:13:48 -0600 |
| commit | a878d3ef3f87b6d971190423b7c70b1919c97a67 (patch) | |
| tree | 2d0faac89759ef40a3eab0142cc761ef3341a0b9 /kate/data/javascript-php.xml | |
| parent | 333a2116d63ab837db093dbb141bf7cb987686a1 (diff) | |
| parent | 316893d4498bedc490a8e21a54a73d9f5ca58424 (diff) | |
| download | tdelibs-a878d3ef3f87b6d971190423b7c70b1919c97a67.tar.gz tdelibs-a878d3ef3f87b6d971190423b7c70b1919c97a67.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kate/data/javascript-php.xml')
| -rw-r--r-- | kate/data/javascript-php.xml | 9 |
1 files changed, 3 insertions, 6 deletions
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 ([email protected]), Joseph Wenninger ([email protected]), Whitehawk Stormchaser ([email protected])" license=""> <highlighting> @@ -109,17 +109,14 @@ <AnyChar attribute="Symbol" String=":!%&+,-/.*<=>?|~^;" /> </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"> |