diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-10 21:10:08 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-23 02:22:42 +0100 |
| commit | 2b3588da89912494c3c1b6817ed5e5c015b9887c (patch) | |
| tree | ef9e50bf37edf233be29317d0ed9672d705439e4 /kate | |
| parent | f4b8e3a055ccbb2ddebf14409de1ace25c919c27 (diff) | |
| download | tdelibs-2b3588da89912494c3c1b6817ed5e5c015b9887c.tar.gz tdelibs-2b3588da89912494c3c1b6817ed5e5c015b9887c.zip | |
Reverted alert style definition for Kate's syntax highlighting. This resolves bug 2050.
(cherry picked from commit 0290dbaf6c3a1b5a82e38ffba2c4fd5272511642)
Diffstat (limited to 'kate')
| -rw-r--r-- | kate/data/alert.xml | 43 | ||||
| -rw-r--r-- | kate/data/update-files.xml | 2 |
2 files changed, 14 insertions, 31 deletions
diff --git a/kate/data/alert.xml b/kate/data/alert.xml index ab6c76ab4..2fe639f3c 100644 --- a/kate/data/alert.xml +++ b/kate/data/alert.xml @@ -25,54 +25,37 @@ This file is included in every file that highlights the "alerts" keywords. That's why extensions and mimetype are empty. - - Changes by Alex Turbov: - Introduce 3 alert levels and sort keywords according importance. - Few more keywords has been added. --> -<language version="1.09-1" kateversion="2.3" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true"> +<language version="1.09-2" kateversion="2.3" name="Alerts" section="Other" extensions="" mimetype="" author="Dominik Haumann (dhdev@gmx.de)" license="LGPL" hidden="true"> <highlighting> - <list name="alerts_hi"> + <list name="alerts"> + <item> ### </item> <item> ALERT </item> - <item> ATTENTION </item> - <item> DANGER </item> - <item> HACK </item> - <item> SECURITY </item> - </list> - <list name="alerts_mid"> <item> BUG </item> - <item> FIXME </item> + <item> DANGER </item> <item> DEPRECATED </item> - <item> TASK </item> - <item> TODO </item> - <item> TBD </item> - <item> WARNING </item> - <item> CAUTION </item> - <item> NOLINT </item> - </list> - <list name="alerts_lo"> - <item> ### </item> + <item> FIXME </item> + <item> HACK </item> <item> NOTE </item> <item> NOTICE </item> + <item> SECURITY </item> + <item> TASK </item> <item> TEST </item> <item> TESTING </item> + <item> TODO </item> + <item> WARNING </item> </list> <contexts> <context attribute="Normal Text" lineEndContext="#pop" name="Normal Text" > - <keyword attribute="Alert Level 1" context="#stay" String="alerts_hi" /> - <keyword attribute="Alert Level 2" context="#stay" String="alerts_mid" /> - <keyword attribute="Alert Level 3" context="#stay" String="alerts_lo" /> + <keyword attribute="Alert" context="#stay" String="alerts" /> </context> </contexts> <itemDatas> - <itemData name="Normal Text" defStyleNum="dsNormal"/> - <itemData name="Alert Level 1" defStyleNum="dsAlert" color="#e85848" selColor="#e85848" backgroundColor="#451e1a" /> - <itemData name="Alert Level 2" defStyleNum="dsAlert" color="#ca9219" selColor="#ca9219" backgroundColor="#451e1a" /> - <itemData name="Alert Level 3" defStyleNum="dsAlert" color="#81ca2d" selColor="#81ca2d" /> + <itemData name="Normal Text" defStyleNum="dsNormal"/> + <itemData name="Alert" defStyleNum="dsAlert"/> </itemDatas> </highlighting> <general> <keywords casesensitive="1"/> </general> </language> -<!-- kate: indent-width 2; --> diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml index d4ae83a21..702a6e0d2 100644 --- a/kate/data/update-files.xml +++ b/kate/data/update-files.xml @@ -7,7 +7,7 @@ <Definition name="AHDL" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ahdl.xml" version="1.04"/> <Definition name="AutoHotKey" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ahk.xml" version="1.0"/> <Definition name="Alerts_indent" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/alert_indent.xml" version="1.09-1"/> -<Definition name="Alerts" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/alert.xml" version="1.09-1"/> +<Definition name="Alerts" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/alert.xml" version="1.09-2"/> <Definition name="AMPLE" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ample.xml" version="0.2"/> <Definition name="ANSI C89" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ansic89.xml" version="1.10-1"/> <Definition name="Ansys" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/ansys.xml" version="1.2"/> |