Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2012-03-12 20:13:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2012-01-27 15:18:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2012-03-12 20:14:16.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:12:52 CET 2012 - dmuel...@suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kate-4.8.0.tar.bz2 New: ---- kate-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.UkQqpy/_old 2012-03-12 20:14:19.000000000 +0100 +++ /var/tmp/diff_new_pack.UkQqpy/_new 2012-03-12 20:14:19.000000000 +0100 @@ -17,7 +17,7 @@ Name: kate -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Advanced Text Editor License: GPL-2.0+ @@ -148,8 +148,8 @@ Summary: KDE Text Editor Group: Productivity/Editors/Other Requires: libktexteditor = %{version} -Provides: kdebase3:/opt/kde3/bin/kwrite Provides: kde4-kwrite = 4.3.0 +Provides: kdebase3:/opt/kde3/bin/kwrite Obsoletes: kde4-kwrite < 4.3.0 %kde4_runtime_requires ++++++ kate-4.8.0.tar.bz2 -> kate-4.8.1.tar.bz2 ++++++ Files old/kate-4.8.0/doc/kate/index.cache.bz2 and new/kate-4.8.1/doc/kate/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/doc/kate/vi.docbook new/kate-4.8.1/doc/kate/vi.docbook --- old/kate-4.8.0/doc/kate/vi.docbook 2011-12-20 20:12:15.000000000 +0100 +++ new/kate-4.8.1/doc/kate/vi.docbook 2012-02-29 23:56:34.000000000 +0100 @@ -3,8 +3,9 @@ <chapterinfo> <authorgroup><author> &Erlend.Hamberg; &Erlend.Hamberg.mail; -</author></authorgroup> +</author> <!-- TRANS:ROLES_OF_TRANSLATORS --> +</authorgroup> </chapterinfo> <title>The VI Input Mode</title> Files old/kate-4.8.0/doc/kwrite/index.cache.bz2 and new/kate-4.8.1/doc/kwrite/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/doc/kwrite/menus.docbook new/kate-4.8.1/doc/kwrite/menus.docbook --- old/kate-4.8.0/doc/kwrite/menus.docbook 2011-11-17 21:56:49.000000000 +0100 +++ new/kate-4.8.1/doc/kwrite/menus.docbook 2012-02-29 23:56:34.000000000 +0100 @@ -508,7 +508,9 @@ <listitem> <para>Displays the Katepart command line at the bottom of the window. In the command line, type <userinput>help</userinput> to get help and <userinput>help list</userinput> -to get a list of commands.</para> +to get a list of commands. For more information on the command line, see +<ulink url="help:/kate/advanced-editing-tools-commandline.html">The Editor +Component Command Line</ulink>.</para> </listitem> </varlistentry> @@ -518,7 +520,7 @@ </menuchoice> (Power user mode)</term> <listitem><para>This opens a tool view that allows you to run Javascript code interactively. For more information, see -<ulink url="help:/kate/index.html#advanced-editing-tools-scripting">Extending &kate; with Scripts</ulink> +<ulink url="help:/kate/advanced-editing-tools-scripting.html">Extending &kate; with Scripts</ulink> </para></listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/data/kate.desktop new/kate-4.8.1/kate/data/kate.desktop --- old/kate-4.8.0/kate/data/kate.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/kate/data/kate.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -1,5 +1,6 @@ [Desktop Entry] GenericName=Advanced Text Editor +GenericName[ar]=محرر نصوص متقدّم GenericName[ast]=Editor de testu avanzáu GenericName[bg]=Усъвършенстван текстов редактор GenericName[bs]=Napredni uređivač teksta @@ -55,6 +56,7 @@ GenericName[zh_CN]=高级文本编辑器 GenericName[zh_TW]=進階文字編輯器 Name=Kate +Name[ar]=كيت Name[ast]=Kate Name[be]=Kate Name[bg]=Kate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/data/kateplugin.desktop new/kate-4.8.1/kate/data/kateplugin.desktop --- old/kate-4.8.0/kate/data/kateplugin.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/kate/data/kateplugin.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -3,6 +3,7 @@ X-KDE-ServiceType=Kate/Plugin X-KDE-Derived= Comment=Kate Plugin +Comment[ar]=Kate ملحق Comment[ast]=Complementu de Kate Comment[bg]=Приставка за Kate Comment[bs]=Priključak za Kejt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/plasma/session/plasma-applet-katesession.desktop new/kate-4.8.1/kate/plasma/session/plasma-applet-katesession.desktop --- old/kate-4.8.0/kate/plasma/session/plasma-applet-katesession.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/kate/plasma/session/plasma-applet-katesession.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -77,7 +77,7 @@ Comment[kk]=Kate сеанс жеккіші Comment[km]=កម្មវិធីចាប់ផ្ដើមសម័យ Kate Comment[ko]=Kate 세션 실행기 -Comment[lt]=Kate sesijų paleidėjas +Comment[lt]=Kate sesijų paleidiklis Comment[lv]=Kate sesiju palaidējs Comment[nb]=Kate øktstarter Comment[nds]=Kate-Törnstarter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/plugins/externaltools/kateexternaltoolsplugin.desktop new/kate-4.8.1/kate/plugins/externaltools/kateexternaltoolsplugin.desktop --- old/kate-4.8.0/kate/plugins/externaltools/kateexternaltoolsplugin.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/kate/plugins/externaltools/kateexternaltoolsplugin.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -4,6 +4,7 @@ X-KDE-Library=kateexternaltoolsplugin X-Kate-Version=2.8 Name=External Tools +Name[ar]=الأدوات الخارجية Name[ast]=Ferramientes esternes Name[be]=Знешнія інструменты Name[bg]=Външни инструменти @@ -60,6 +61,7 @@ Name[zh_CN]=外部工具 Name[zh_TW]=外部工具 Comment=External Tools +Comment[ar]=الأدوات الخارجية Comment[ast]=Ferramientes esternes Comment[be]=Знешнія інструменты Comment[bg]=Външни инструменти diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/plugins/filebrowser/katefilebrowserplugin.desktop new/kate-4.8.1/kate/plugins/filebrowser/katefilebrowserplugin.desktop --- old/kate-4.8.0/kate/plugins/filebrowser/katefilebrowserplugin.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/kate/plugins/filebrowser/katefilebrowserplugin.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -4,6 +4,7 @@ X-KDE-Library=katefilebrowserplugin X-Kate-Version=2.8 Name=File system browser +Name[ar]=متصفح نظام الملفات Name[ast]=Restolador del sistema de ficheros Name[bg]=Файлова система Name[bs]=Pregledač datotečnog sistema diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/plugins/filetemplates/plugin/katefiletemplates.desktop new/kate-4.8.1/kate/plugins/filetemplates/plugin/katefiletemplates.desktop --- old/kate-4.8.0/kate/plugins/filetemplates/plugin/katefiletemplates.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/kate/plugins/filetemplates/plugin/katefiletemplates.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -4,6 +4,7 @@ X-Kate-Version=2.8 X-KDE-Library=katefiletemplates Name=File Templates +Name[ar]=قوالب الملفات Name[ast]=Plantíes de ficheros Name[bg]=Файлови шаблони Name[bs]=Šabloni datoteka diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/plugins/filetree/katefiletreeplugin.desktop new/kate-4.8.1/kate/plugins/filetree/katefiletreeplugin.desktop --- old/kate-4.8.0/kate/plugins/filetree/katefiletreeplugin.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/kate/plugins/filetree/katefiletreeplugin.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -5,6 +5,7 @@ X-Kate-Version=2.8 X-Kate-LoadAlways=True Name=File Tree +Name[ar]=شجرة الملفات Name[bg]=Дърво с файлове Name[bs]=Stablo datoteka Name[ca]=Arbre de fitxers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/plugins/quickdocumentswitcher/plugin_katequickdocumentswitcher.cpp new/kate-4.8.1/kate/plugins/quickdocumentswitcher/plugin_katequickdocumentswitcher.cpp --- old/kate-4.8.0/kate/plugins/quickdocumentswitcher/plugin_katequickdocumentswitcher.cpp 2011-08-07 17:41:13.000000000 +0200 +++ new/kate-4.8.1/kate/plugins/quickdocumentswitcher/plugin_katequickdocumentswitcher.cpp 2012-02-29 23:56:34.000000000 +0100 @@ -208,12 +208,22 @@ if (event->type()==QEvent::KeyPress) { QKeyEvent *keyEvent=static_cast<QKeyEvent*>(event); if (obj==m_inputLine) { - if ( (keyEvent->key()==Qt::Key_Up) || (keyEvent->key()==Qt::Key_Down) ) { + const bool forward2list = (keyEvent->key()==Qt::Key_Up) + || (keyEvent->key()==Qt::Key_Down) + || (keyEvent->key()==Qt::Key_PageUp) + || (keyEvent->key()==Qt::Key_PageDown); + if (forward2list) { QCoreApplication::sendEvent(m_listView,event); return true; } } else { - if ( (keyEvent->key()!=Qt::Key_Up) && (keyEvent->key()!=Qt::Key_Down) && (keyEvent->key()!=Qt::Key_Tab) && (keyEvent->key()!=Qt::Key_Backtab)) { + const bool forward2input = (keyEvent->key()!=Qt::Key_Up) + && (keyEvent->key()!=Qt::Key_Down) + && (keyEvent->key()!=Qt::Key_PageUp) + && (keyEvent->key()!=Qt::Key_PageDown) + && (keyEvent->key()!=Qt::Key_Tab) + && (keyEvent->key()!=Qt::Key_Backtab); + if (forward2input) { QCoreApplication::sendEvent(m_inputLine,event); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/plugins/search/katesearch.desktop new/kate-4.8.1/kate/plugins/search/katesearch.desktop --- old/kate-4.8.0/kate/plugins/search/katesearch.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/kate/plugins/search/katesearch.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -16,6 +16,7 @@ Name[it]=Cerca e sostituisci Name[kk]=Іздеу & Ауыстыру Name[km]=ស្វែងរក និងជំនួស +Name[ko]=찾아 바꾸기 Name[lt]=Rasti ir keisti Name[lv]=Meklēt un aizvietot Name[nb]=Søk og erstatt @@ -25,6 +26,8 @@ Name[pl]=Znajdź i zamień Name[pt]=Procurar & Substituir Name[pt_BR]=Pesquisar e substituir +Name[ro]=Căutare și înlocuire +Name[sk]=Hľadať & Nahradiť Name[sl]=Iskanje & zamenjevanje Name[sr]=Претрага и замена Name[sr@ijekavian]=Претрага и замена @@ -48,6 +51,7 @@ Comment[it]=Cerca e sostituisci in documenti aperti o in file sul disco Comment[kk]=Ашық құжаттарда не дискідегі файлдарда іздеу және ауыстыру Comment[km]=ស្វែងរក និងជំនួស នៅក្នុងឯកសារដែលបានបើក ឬក្នុងឯកសារដែលមាននៅលើថាស +Comment[ko]=열린 문서나 디스크에 있는 파일에서 찾아 바꾸기 Comment[lt]=Rasti ir keisti atidarytuose dokumentuose arba disko failuose Comment[lv]=Meklēt un aizvietot atvērtos dokumentos vai failos uz diska Comment[nb]=Søk og erstatt i åpne dokumenter eller i filer på disk @@ -56,6 +60,8 @@ Comment[pl]=Znajdź i zamień w otwartych dokumentach lub w plikach na dysku Comment[pt]=Procurar & substituir nos documentos abertos ou nos ficheiros do disco Comment[pt_BR]=Pesquisar e substituir nos documentos abertos ou nos arquivos do disco +Comment[ro]=Căutare și înlocuire în documentele deschise sau în fișiere de pe disc +Comment[sk]=Hľadať & nahradiť v otvorených dokumentoch alebo v súboroch na disku Comment[sr]=Претрага и замена кроз отворене документе или фајлове на диску Comment[sr@ijekavian]=Претрага и замена кроз отворене документе или фајлове на диску Comment[sr@ijekavianlatin]=Pretraga i zamena kroz otvorene dokumente ili fajlove na disku diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/plugins/skeleton/kateexternaltoolsplugin.desktop new/kate-4.8.1/kate/plugins/skeleton/kateexternaltoolsplugin.desktop --- old/kate-4.8.0/kate/plugins/skeleton/kateexternaltoolsplugin.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/kate/plugins/skeleton/kateexternaltoolsplugin.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -4,6 +4,7 @@ X-KDE-Library=kateexternaltoolsplugin X-Kate-Version=2.8 Name=External Tools +Name[ar]=الأدوات الخارجية Name[ast]=Ferramientes esternes Name[be]=Знешнія інструменты Name[bg]=Външни инструменти @@ -60,6 +61,7 @@ Name[zh_CN]=外部工具 Name[zh_TW]=外部工具 Comment=External Tools +Comment[ar]=الأدوات الخارجية Comment[ast]=Ferramientes esternes Comment[be]=Знешнія інструменты Comment[bg]=Външни инструменти diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/kate/plugins/tabify/katetabifyplugin.desktop new/kate-4.8.1/kate/plugins/tabify/katetabifyplugin.desktop --- old/kate-4.8.0/kate/plugins/tabify/katetabifyplugin.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/kate/plugins/tabify/katetabifyplugin.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -19,6 +19,7 @@ Name[es]=Barra de pestañas Name[et]=Kaardiriba Name[eu]=Fitxa-barra +Name[fa]=میله تب Name[fi]=Välilehtipalkki Name[fr]=Barre d'onglets Name[gl]=Barra de lapelas diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/document/katedocument.cpp new/kate-4.8.1/part/document/katedocument.cpp --- old/kate-4.8.0/part/document/katedocument.cpp 2011-12-20 20:12:15.000000000 +0100 +++ new/kate-4.8.1/part/document/katedocument.cpp 2012-02-29 23:56:34.000000000 +0100 @@ -4670,6 +4670,8 @@ return m_config->backupSuffix(); } else if (key == "backup-on-save-prefix") { return m_config->backupPrefix(); + } else if (key == "replace-tabs") { + return m_config->replaceTabsDyn(); } // return invalid variant @@ -4706,6 +4708,8 @@ } m_config->setBackupFlags(f); + } else if (key == "replace-tabs") { + m_config->setReplaceTabsDyn(bValue); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/render/katerenderer.cpp new/kate-4.8.1/part/render/katerenderer.cpp --- old/kate-4.8.0/part/render/katerenderer.cpp 2012-01-02 20:52:15.000000000 +0100 +++ new/kate-4.8.1/part/render/katerenderer.cpp 2012-02-29 23:56:34.000000000 +0100 @@ -897,7 +897,7 @@ line.setPosition(QPoint(line.lineNumber() ? shiftX : 0, height)); - if (needShiftX) { + if (needShiftX && line.width() > 0) { needShiftX = false; // Determine x offset for subsequent-lines-of-paragraph indenting int pos = textLine->nextNonSpaceChar(0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/syntax/data/cpp.xml new/kate-4.8.1/part/syntax/data/cpp.xml --- old/kate-4.8.0/part/syntax/data/cpp.xml 2011-07-27 20:40:08.000000000 +0200 +++ new/kate-4.8.1/part/syntax/data/cpp.xml 2012-02-29 23:56:34.000000000 +0100 @@ -34,6 +34,7 @@ <item> export </item> <item> extern </item> <item> false </item> + <item> final </item> <item> friend </item> <item> for </item> <item> goto </item> @@ -43,6 +44,7 @@ <item> new </item> <item> nullptr </item> <item> operator </item> + <item> override </item> <item> private </item> <item> protected </item> <item> public </item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/syntax/data/lua.xml new/kate-4.8.1/part/syntax/data/lua.xml --- old/kate-4.8.0/part/syntax/data/lua.xml 2011-08-22 15:31:05.000000000 +0200 +++ new/kate-4.8.1/part/syntax/data/lua.xml 2012-02-29 23:56:34.000000000 +0100 @@ -35,7 +35,7 @@ - improved highlighting --> -<language name="Lua" version="1.04" indenter="lua" kateversion="2.4" section="Scripts" extensions="*.lua" mimetype="text/x-lua"> +<language name="Lua" version="1.05" indenter="lua" kateversion="2.4" section="Scripts" extensions="*.lua" mimetype="text/x-lua"> <highlighting> <list name="keywords"> <item> and </item> @@ -213,10 +213,6 @@ </list> <contexts> - <context name="Base" attribute="Comment" lineEndContext="Normal"> - <RegExpr attribute="Comment" context="Normal" String="#!.*$" column="0" /> - <RegExpr attribute="Comment" context="Normal" String="^.*$" lookAhead="true" /> - </context> <context name="Normal" attribute="Normal Text" lineEndContext="#stay"> <IncludeRules context="##DoxygenLua" /> <keyword attribute="Error" context="#stay" String="deprecated" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/syntax/data/perl.xml new/kate-4.8.1/part/syntax/data/perl.xml --- old/kate-4.8.0/part/syntax/data/perl.xml 2011-07-27 20:40:08.000000000 +0200 +++ new/kate-4.8.1/part/syntax/data/perl.xml 2012-02-29 23:56:34.000000000 +0100 @@ -39,7 +39,7 @@ Enhance tr/// and y/// support. --> -<language name="Perl" version="1.25" kateversion="2.4" section="Scripts" extensions="*.pl;*.pm" mimetype="application/x-perl;text/x-perl" author="Anders Lund (and...@alweb.dk)" license="LGPL"> +<language name="Perl" version="1.26" kateversion="2.4" section="Scripts" extensions="*.pl;*.pm" mimetype="application/x-perl;text/x-perl" author="Anders Lund (and...@alweb.dk)" license="LGPL"> <highlighting> <list name="keywords"> <item> if </item> @@ -56,18 +56,18 @@ <item> break </item> <item> continue </item> <item> return </item> - <item> use </item> - <item> no </item> - <item> require </item> <item> my </item> <item> our </item> <item> local </item> + <item> state </item> <item> BEGIN </item> <item> END </item> - <item>require</item> <item> package </item> <item> sub </item> <item> do </item> + <item> given </item> + <item> when </item> + <item> default </item> <item> __END__ </item> <item> __DATA__ </item> <item> __FILE__ </item> @@ -221,6 +221,7 @@ <item>msgget</item> <item>msgrcv</item> <item>msgsnd</item> + <item>no</item> <item>oct</item> <item>open</item> <item>opendir</item> @@ -244,6 +245,7 @@ <item>redo</item> <item>ref</item> <item>rename</item> + <item>require</item> <item>reset</item> <item>return</item> <item>reverse</item> @@ -307,6 +309,7 @@ <item>unpack</item> <item>unshift</item> <item>untie</item> + <item>use</item> <item>utime</item> <item>values</item> <item>vec</item> @@ -366,7 +369,7 @@ <RegExpr attribute="Normal Text" context="#stay" String="\s*\}\s*/{1,2}" endRegion="Block"/> <RegExpr attribute="Normal Text" context="#stay" String="\s*[)\]]\s*/{1,2}" /> - + <RegExpr attribute="Function" context="sub_name_def" String="\w+::" /> <RegExpr attribute="Normal Text" context="#stay" String="\w+[=]" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/syntax/data/wml.xml new/kate-4.8.1/part/syntax/data/wml.xml --- old/kate-4.8.0/part/syntax/data/wml.xml 2011-07-27 20:40:08.000000000 +0200 +++ new/kate-4.8.1/part/syntax/data/wml.xml 2012-02-29 23:56:34.000000000 +0100 @@ -5,6 +5,10 @@ Alternatively try the "normal" way: #kate@freenode, kwrite-de...@kde.org Changelog (0.35 and later): *************************** +* 0.42 + - 2011-11-15 <shadowm2...@gmail.com>: + * Added preprocessor directives: #error, #warning + * Added highlighting for the wmlxgettext annotation metadirective (po:) * 0.41 - 2011-04-15 <shadowm2...@gmail.com>: * Added preprocessor directives: #if(n)have, #if(n)ver @@ -50,18 +54,21 @@ * Made the new #ifndef directive be recognized (implemented on Wesnoth 1.3.11 and later) --> -<language name="Wesnoth Markup Language" section="Markup" extensions="*.cfg;*.pbl;*.CFG;*.PBL" version="0.41" +<language name="Wesnoth Markup Language" section="Markup" extensions="*.cfg;*.pbl;*.CFG;*.PBL" version="0.42" kateversion="2.5" casesensitive="true" author="Zachary Palmer (ze...@bahj.com), modif. by Ignacio Riquelme Morelle (shadowm2...@gmail.com) and Jonathan Schmidt-Dominé (de...@the-user.org)" license="GPL"> <highlighting> <list name="alerts_wml_utils"> <item> wmllint</item> <item> wmlindent</item> <item> wmlscope</item> + <item> po</item> </list> <list name="preprocessor_directive_statements"> <item>#textdomain</item> <item>#else</item> <item>#undef</item> + <item>#error</item> + <item>#warning</item> </list> <list name="preprocessor_block_begin_statements"> <item>#define</item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/syntax/katecodefolding.cpp new/kate-4.8.1/part/syntax/katecodefolding.cpp --- old/kate-4.8.0/part/syntax/katecodefolding.cpp 2011-12-02 22:31:34.000000000 +0100 +++ new/kate-4.8.1/part/syntax/katecodefolding.cpp 2012-02-29 23:56:34.000000000 +0100 @@ -743,7 +743,9 @@ // Searches for the node placed on a specific position KateCodeFoldingNode* KateCodeFoldingTree::findNodeAt(const KateDocumentPosition& position) const { - Q_ASSERT(m_lineMapping.contains(position.line)); + if (!m_lineMapping.contains(position.line)) { + return 0; + } foreach (KateCodeFoldingNode *node, m_lineMapping.value(position.line)) { if (node->m_position == position) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/tests/katefolding_test.cpp new/kate-4.8.1/part/tests/katefolding_test.cpp --- old/kate-4.8.0/part/tests/katefolding_test.cpp 2011-08-22 15:31:05.000000000 +0200 +++ new/kate-4.8.1/part/tests/katefolding_test.cpp 2012-02-29 23:56:34.000000000 +0100 @@ -395,3 +395,25 @@ action->trigger(); QCOMPARE(doc.visibleLines(), 5u); } + +void KateFoldingTest::testFindNodeForPosition() +{ + // see also: https://bugs.kde.org/show_bug.cgi?id=289469 + + KTemporaryFile file; + file.setSuffix(".cpp"); + file.open(); + QTextStream stream(&file); + stream << "int f() {\n" + << " int i;\n" + << "}\n"; + stream << flush; + file.close(); + + KateDocument doc(false, false, false); + QVERIFY(doc.openUrl(KUrl(file.fileName()))); + + QVERIFY(!doc.foldingTree()->findNodeForPosition(1, 0)); + QVERIFY(doc.foldingTree()->findNodeForLine(1)); + QVERIFY(doc.foldingTree()->findNodeForLine(0)); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/tests/katefolding_test.h new/kate-4.8.1/part/tests/katefolding_test.h --- old/kate-4.8.0/part/tests/katefolding_test.h 2011-08-22 15:31:05.000000000 +0200 +++ new/kate-4.8.1/part/tests/katefolding_test.h 2012-02-29 23:56:34.000000000 +0100 @@ -42,6 +42,7 @@ void testFolding_collapse_expand_local(); void testFolding_collapse_dsComments_C(); void testFolding_collapse_dsComments_XML(); + void testFindNodeForPosition(); }; #endif // KATE_FOLDING_TEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/utils/kateconfig.cpp new/kate-4.8.1/part/utils/kateconfig.cpp --- old/kate-4.8.0/part/utils/kateconfig.cpp 2011-08-22 15:31:05.000000000 +0200 +++ new/kate-4.8.1/part/utils/kateconfig.cpp 2012-02-29 23:56:34.000000000 +0100 @@ -1066,6 +1066,7 @@ m_scrollBarMarksSet (true), m_iconBarSet (true), m_foldingBarSet (true), + m_lineModificationSet (true), m_bookmarkSortSet (true), m_autoCenterLinesSet (true), m_searchFlagsSet (true), @@ -1099,6 +1100,7 @@ m_scrollBarMarksSet (false), m_iconBarSet (false), m_foldingBarSet (false), + m_lineModificationSet (false), m_bookmarkSortSet (false), m_autoCenterLinesSet (false), m_searchFlagsSet (false), @@ -1144,6 +1146,8 @@ setFoldingBar (config.readEntry( "Folding Bar", true)); + setLineModification (config.readEntry( "Line Modification", true)); + setBookmarkSort (config.readEntry( "Bookmark Menu Sorting", 0 )); setAutoCenterLines (config.readEntry( "Auto Center Lines", 0 )); @@ -1195,6 +1199,8 @@ config.writeEntry( "Folding Bar", foldingBar() ); + config.writeEntry( "Line Modification", lineModification() ); + config.writeEntry( "Bookmark Menu Sorting", bookmarkSort() ); config.writeEntry( "Auto Center Lines", autoCenterLines() ); @@ -1372,6 +1378,24 @@ configEnd (); } + +bool KateViewConfig::lineModification () const +{ + if (m_lineModificationSet || isGlobal()) + return m_lineModification; + + return s_global->lineModification(); +} + +void KateViewConfig::setLineModification (bool on) +{ + configStart (); + + m_lineModificationSet = true; + m_lineModification = on; + + configEnd (); +} int KateViewConfig::bookmarkSort () const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/utils/kateconfig.h new/kate-4.8.1/part/utils/kateconfig.h --- old/kate-4.8.0/part/utils/kateconfig.h 2011-07-27 20:40:08.000000000 +0200 +++ new/kate-4.8.1/part/utils/kateconfig.h 2012-02-29 23:56:34.000000000 +0100 @@ -443,6 +443,9 @@ bool foldingBar () const; void setFoldingBar (bool on); + bool lineModification() const; + void setLineModification(bool on); + int bookmarkSort () const; void setBookmarkSort (int mode); @@ -523,6 +526,7 @@ bool m_scrollBarMarks; bool m_iconBar; bool m_foldingBar; + bool m_lineModification; int m_bookmarkSort; int m_autoCenterLines; long m_searchFlags; @@ -547,6 +551,7 @@ bool m_scrollBarMarksSet : 1; bool m_iconBarSet : 1; bool m_foldingBarSet : 1; + bool m_lineModificationSet : 1; bool m_bookmarkSortSet : 1; bool m_autoCenterLinesSet : 1; bool m_searchFlagsSet : 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/part/view/kateviewhelpers.cpp new/kate-4.8.1/part/view/kateviewhelpers.cpp --- old/kate-4.8.0/part/view/kateviewhelpers.cpp 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/part/view/kateviewhelpers.cpp 2012-02-29 23:56:34.000000000 +0100 @@ -876,10 +876,13 @@ if (m_foldingMarkersOn) w += iconPaneWidth; - /** - * space for the line change system and border! - */ - w += 5; + // space for the line modification system border + if (m_view->config()->lineModification()) { + w += 3; + } + + // two pixel space + w += 2; return QSize( w, 0 ); } @@ -1251,10 +1254,12 @@ } // modified line system - if (realLine > -1 && !m_doc->url().isEmpty()) { + if (m_view->config()->lineModification() && + realLine > -1 && !m_doc->url().isEmpty()) + { // one pixel space ++lnX; - + Kate::TextLine tl = m_doc->plainKateTextLine(realLine); if (tl->markedAsModified()) { p.setPen(Qt::red); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.8.0/playground/kte_acomment/ktexteditor_acomment.desktop new/kate-4.8.1/playground/kte_acomment/ktexteditor_acomment.desktop --- old/kate-4.8.0/playground/kte_acomment/ktexteditor_acomment.desktop 2012-01-18 19:49:16.000000000 +0100 +++ new/kate-4.8.1/playground/kte_acomment/ktexteditor_acomment.desktop 2012-02-29 23:56:34.000000000 +0100 @@ -29,6 +29,7 @@ Comment[pt_BR]=Formata os comentários extensos de código-fonte, como os cabeçalhos de licenças e descrições, usando diferentes estilos Comment[ro]=Formatează comentarii de cod-sursă lungi ca antetele-licență sau descrieri folosind stiluri diferite. Comment[si]=බලපත් ශීර්ෂ හෝ විස්තර වැනි දීර්ඝ මූල-කේත සටහන් වෙන් වෙන් රටා භාවිතයෙන් හැඩසවි ගන්වන්න +Comment[sk]=Formátovať dlhé komentáre zdrojového kódu ako licenčné hlavičky alebo popisy pomocou rôznych štýlov Comment[sl]=Dolge opombe v izvorni kodi, kot so glave z dovoljenji ali opisi, oblikuje v različnih slogih Comment[sr]=Форматира дугачке коментаре у изворном коду, попут заглавља лиценци и описа, на различите начине Comment[sr@ijekavian]=Форматира дугачке коментаре у изворном коду, попут заглавља лиценци и описа, на различите начине @@ -70,6 +71,7 @@ Name[pt_BR]=Comentário artístico Name[ro]=Comentariu artistic Name[si]=කලාත්මක සටහන +Name[sk]=Umelecký komentár Name[sl]=Umetniška opomba Name[sr]=Уметнички коментар Name[sr@ijekavian]=Уметнички коментар @@ -112,6 +114,7 @@ GenericName[pt_BR]=Formatar os comentários de forma "artística" GenericName[ro]=Formatează comentariile într-un mod „artistic” GenericName[si]=සටහන් "කලාත්මක" අයුරකින් හැඩසවි ගන්වයි +GenericName[sk]=Fotmátovať komentár "umeleckým" spôsobom GenericName[sl]=Oblikuje opombe na »umetniški« način GenericName[sr]=Форматира коментаре на „уметнички“ начин GenericName[sr@ijekavian]=Форматира коментаре на „умјетнички“ начин -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
