diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-11 16:14:23 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-02 19:05:19 +0200 |
| commit | 8f01bb25dfbf64d17f1b64bc54d68044550483f0 (patch) | |
| tree | 98fb3ada372f0f705fa665899c46811b2ec354a2 /kate/data/cpp.xml | |
| parent | bea964028bf3b0b8b0f4dfabd7e7652e39941571 (diff) | |
| download | tdelibs-8f01bb25dfbf64d17f1b64bc54d68044550483f0.tar.gz tdelibs-8f01bb25dfbf64d17f1b64bc54d68044550483f0.zip | |
Update kate synatax highlighting files
This closes Bug 764
(cherry picked from commit 7439a4b0e05832e047040ab8bf9ef13abd9288b2)
Diffstat (limited to 'kate/data/cpp.xml')
| -rw-r--r-- | kate/data/cpp.xml | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/kate/data/cpp.xml b/kate/data/cpp.xml index 6007caf73..4b27772dd 100644 --- a/kate/data/cpp.xml +++ b/kate/data/cpp.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd"> <language name="C++" section="Sources" - version="1.44" kateversion="2.4" + version="1.49" kateversion="2.4" indenter="cstyle" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" @@ -20,8 +20,10 @@ <item> case </item> <item> catch </item> <item> class </item> + <item> constexpr </item> <item> const_cast </item> <item> continue </item> + <item> decltype </item> <item> default </item> <item> delete </item> <item> do </item> @@ -39,6 +41,7 @@ <item> inline </item> <item> namespace </item> <item> new </item> + <item> nullptr </item> <item> operator </item> <item> private </item> <item> protected </item> @@ -47,6 +50,7 @@ <item> reinterpret_cast </item> <item> return </item> <item> sizeof </item> + <item> static_assert </item> <item> static_cast </item> <item> struct </item> <item> switch </item> @@ -77,9 +81,6 @@ <item> or_eq </item> <item> xor </item> <item> xor_eq </item> - <item> except </item> - <item> finally </item> - <item> xalloc </item> </list> <list name="extensions"> <item> K_DCOP </item> @@ -155,6 +156,8 @@ <item> auto </item> <item> bool </item> <item> char </item> + <item> char16_t </item> + <item> char32_t </item> <item> const </item> <item> double </item> <item> float </item> @@ -183,7 +186,7 @@ <contexts> <context attribute="Normal Text" lineEndContext="#stay" name="Normal"> <DetectSpaces /> - <RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0" beginRegion="PP" firstNonSpace="true" /> + <RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0\s*$" beginRegion="PP" firstNonSpace="true" /> <DetectChar context="AfterHash" char="#" firstNonSpace="true" lookAhead="true" /> <StringDetect attribute="Region Marker" context="Region Marker" String="//BEGIN" beginRegion="Region1" firstNonSpace="true" /> <StringDetect attribute="Region Marker" context="Region Marker" String="//END" endRegion="Region1" firstNonSpace="true" /> @@ -272,7 +275,6 @@ <DetectSpaces /> <IncludeRules context="##Alerts" /> <DetectIdentifier /> - <DetectChar attribute="String" context="String" char="""/> <IncludeRules context="##Doxygen" /> <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/> <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/> @@ -294,23 +296,23 @@ </context> </contexts> <itemDatas> - <itemData name="Normal Text" defStyleNum="dsNormal"/> - <itemData name="Keyword" defStyleNum="dsKeyword"/> - <itemData name="Extensions" defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0"/> - <itemData name="Data Type" defStyleNum="dsDataType"/> - <itemData name="Decimal" defStyleNum="dsDecVal"/> - <itemData name="Octal" defStyleNum="dsBaseN"/> - <itemData name="Hex" defStyleNum="dsBaseN"/> - <itemData name="Float" defStyleNum="dsFloat"/> - <itemData name="Char" defStyleNum="dsChar"/> + <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/> + <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false"/> + <itemData name="Extensions" defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0" spellChecking="false"/> + <itemData name="Data Type" defStyleNum="dsDataType" spellChecking="false"/> + <itemData name="Decimal" defStyleNum="dsDecVal" spellChecking="false"/> + <itemData name="Octal" defStyleNum="dsBaseN" spellChecking="false"/> + <itemData name="Hex" defStyleNum="dsBaseN" spellChecking="false"/> + <itemData name="Float" defStyleNum="dsFloat" spellChecking="false"/> + <itemData name="Char" defStyleNum="dsChar" spellChecking="false"/> <itemData name="String" defStyleNum="dsString"/> <itemData name="String Char" defStyleNum="dsChar"/> <itemData name="Comment" defStyleNum="dsComment"/> - <itemData name="Symbol" defStyleNum="dsNormal"/> - <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> - <itemData name="Region Marker" defStyleNum="dsRegionMarker" /> - <itemData name="Error" defStyleNum="dsError" /> + <itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/> + <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/> + <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> + <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/> + <itemData name="Error" defStyleNum="dsError" spellChecking="false"/> </itemDatas> </highlighting> <general> |