Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2014-05-22 06:49:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2014-04-18 12:37:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2014-05-22 06:49:19.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 9 16:41:00 UTC 2014 - [email protected] + +- Update to 4.13.1 + * KDE 4.13.1 bug fix release + * See http://www.kde.org/announcements/announce-4.13.1.php + +------------------------------------------------------------------- Old: ---- kate-4.13.0.tar.xz New: ---- kate-4.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.W7Oq1N/_old 2014-05-22 06:49:20.000000000 +0200 +++ /var/tmp/diff_new_pack.W7Oq1N/_new 2014-05-22 06:49:20.000000000 +0200 @@ -17,7 +17,7 @@ Name: kate -Version: 4.13.0 +Version: 4.13.1 Release: 0 Summary: Advanced Text Editor License: GPL-2.0+ ++++++ kate-4.13.0.tar.xz -> kate-4.13.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/openheader/kateopenheader.desktop new/kate-4.13.1/addons/kate/openheader/kateopenheader.desktop --- old/kate-4.13.0/addons/kate/openheader/kateopenheader.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/openheader/kateopenheader.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -51,7 +51,7 @@ Name[sr@latin]=Otvaranje zaglavlja Name[sv]=Öppna deklarationsfil Name[tg]=Кушодани сарлавҳа -Name[tr]=Open Header +Name[tr]=Başlığı Aç Name[ug]=باشنى ئاچ Name[uk]=Відкрити заголовок Name[x-test]=xxOpen Headerxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -27,6 +27,7 @@ Name[pl]=Narzędzia CMake Name[pt]=Utilitários do CMake Name[pt_BR]=Utilitários do CMake +Name[ro]=Utilitare CMake Name[ru]=Утилиты CMake Name[sk]=Nástroje CMake Name[sl]=Pripomočki za CMake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/color_tools/katepate_color_tools.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -26,6 +26,7 @@ Name[pl]=Narzędzia koloru Name[pt]=Ferramentas de Cores Name[pt_BR]=Ferramentas de cores +Name[ro]=Unelte de culoare Name[ru]=Цветовые утилиты Name[sk]=Farebné nástroje Name[sl]=Orodja za barve @@ -64,6 +65,7 @@ Comment[pl]=Narzędzia do pracy z szesnastkowymi kolorami w dokumentach Comment[pt]=Utilitários para lidar com cores hexadecimais nos documentos Comment[pt_BR]=Utilitários para lidar com cores hexadecimais nos documentos +Comment[ro]=Utilitare pentru lucrul cu culori hexazecimale în documente Comment[ru]=Инструменты для работы с шестнадцатеричными цветами в документах Comment[sk]=Nástroje na prácu s hexadecimálnymi farbami v dokumentoch Comment[sl]=Pripomočki za delo s šestnajstiškimi barvami v dokumentih diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/js_utils/katepate_js_utils.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -27,6 +27,7 @@ Name[pl]=Narzędzia JavaScript Name[pt]=Utilitários de JavaScript Name[pt_BR]=Utilitários do JavaScript +Name[ro]=Utilitare JavaScript Name[ru]=Утилиты для JavaScript Name[sk]=Nástroje JavaScript Name[sl]=Pripomočki za JavaScript diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/katepate_block.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/katepate_block.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/katepate_block.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/katepate_block.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -63,6 +63,7 @@ Comment[pl]=Różne działania pomocne przy edytowaniu kodu Comment[pt]=Várias acções para ajudar na edição de código Comment[pt_BR]=Várias ações para ajudar na edição de código +Comment[ro]=Diverse acțiuni ce ajută la redactarea codului Comment[ru]=Операции, полезные при редактировании кода Comment[sk]=Rôzne akcie na pomoc pri editovaní kódu Comment[sl]=Različna dejanja za pomoč pri urejanju kode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/katepate_commentar.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/katepate_commentar.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/katepate_commentar.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/katepate_commentar.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -26,6 +26,7 @@ Name[pl]=Wtyczki działające na komentarzach Name[pt]='Plugins' para lidar com comentários Name[pt_BR]=Plugins para lidar com comentários +Name[ro]=Extensii pentru lucrul cu comentarii Name[ru]=Модули для работы с комментариями Name[sk]=Pluginy na prácu s komentármi Name[sl]=Vstavki za delo z opombami @@ -63,6 +64,7 @@ Comment[pl]=Obsługiwane języki to C++, JS, Python, CMake, Bash Comment[pt]=As linguagens suportadas são o C++, JS, Python, CMake, Bash Comment[pt_BR]=As linguagens suportadas são o C++, JS, Python, CMake e Bash +Comment[ro]=Limbajele susținute sînt C++, JS, Python, CMake, Bash Comment[ru]=Поддерживаются языки: C++, JS, Python, CMake, Bash Comment[sk]=Podporované jazyky sú C++, JS, Python, CMake, Bash Comment[sl]=Podprti jeziki so C++, JS, Python, CMake, Bash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/katepate_python_autocomplete_jedi.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -26,6 +26,7 @@ Name[pl]=Samoczynne uzupełnianie Python Name[pt]=Completação Automática de Python Name[pt_BR]=Completação automática de Python +Name[ro]=Completare automată Python Name[ru]=Автодополнение Python Name[sk]=Automatické ukončovanie Python Name[sl]=Samodejno dopolnjevanje za Python @@ -63,6 +64,7 @@ Comment[pl]=Oparte na bibliotece Jedi Comment[pt]=Baseado na biblioteca Jedi Comment[pt_BR]=Baseado na biblioteca Jedi +Comment[ro]=Pe baza bibliotecii Jedi Comment[ru]=Построено на базе библиотеки Jedi Comment[sk]=Založené na knižnici Jedi Comment[sl]=Temelji na knjižnici Jedi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/katepate_try_open_file.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/katepate_try_open_file.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/katepate_try_open_file.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/katepate_try_open_file.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -24,6 +24,7 @@ Name[pl]=Łatwe otwieranie/tworzenie pliku Name[pt]=Abertura/criação simples de ficheiros Name[pt_BR]=Abertura/criação simples de arquivos +Name[ro]=Creare/deschidere ușoară a fișierelor Name[ru]=Простое открытие/создание файла Name[sk]=Ľahko otvoriť/vytvoriť súbor Name[sl]=Enostavno odpri/ustvari datoteko diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/katepate_xml_pretty.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -26,6 +26,7 @@ Name[pl]=Narzędzia XML Name[pt]=Ferramentas de XML Name[pt_BR]=Ferramentas de XML +Name[ro]=Unelte XML Name[ru]=Инструменты для XML Name[sk]=XML nástroje Name[sl]=Orodja za XML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/python_autocomplete/katepate_python_autocomplete.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -26,6 +26,7 @@ Name[pl]=Samoczynne uzupełnianie Python Name[pt]=Completação Automática de Python Name[pt_BR]=Completação automática de Python +Name[ro]=Completare automată Python Name[ru]=Автодополнение Python Name[sk]=Automatické ukončovanie Python Name[sl]=Samodejno dopolnjevanje za Python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/python_console_classic/katepate_python_console_classic.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -26,6 +26,7 @@ Name[pl]=Prosta konsola Pythona Name[pt]=Consola de Python Simples Name[pt_BR]=Console de Python simples +Name[ro]=Consolă simplă Python Name[ru]=Простая консоль Python Name[sk]=Jednoduchá konzola Python Name[sl]=Preprosta konzola za Python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/python_console_ipython/katepate_python_console_ipython.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -27,6 +27,7 @@ Name[pl]=Konsola IPython Name[pt]=Consola do IPython Name[pt_BR]=Console do IPython +Name[ro]=Consolă IPython Name[ru]=Консоль IPython Name[sk]=Konzola programu IPython Name[sl]=Konzola IPython diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop new/kate-4.13.1/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop --- old/kate-4.13.0/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/pate/src/plugins/python_utils/katepate_python_utils.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -27,6 +27,7 @@ Name[pl]=Narzędzia Python Name[pt]=Utilitários de Python Name[pt_BR]=Utilitários de Python +Name[ro]=Utilitare Python Name[ru]=Утилиты Python Name[sk]=Nástroje Python Name[sl]=Potrebščine za Python diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/replicode/katereplicodeplugin.desktop new/kate-4.13.1/addons/kate/replicode/katereplicodeplugin.desktop --- old/kate-4.13.0/addons/kate/replicode/katereplicodeplugin.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/replicode/katereplicodeplugin.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -23,6 +23,7 @@ Name[pl]=Replicode Name[pt]=Replicode Name[pt_BR]=Replicode +Name[ro]=Replicode Name[sk]=Replikovať Name[sl]=Replicode Name[sr]=Репликод @@ -30,6 +31,7 @@ Name[sr@ijekavianlatin]=Replicode Name[sr@latin]=Replicode Name[sv]=Replicode +Name[tr]=Replicode Name[uk]=Replicode Name[x-test]=xxReplicodexx Name[zh_TW]=Replicode @@ -52,6 +54,7 @@ Comment[pl]=Replicode Comment[pt]=Replicode Comment[pt_BR]=Replicode +Comment[ro]=Replicode Comment[sk]=Replikovať Comment[sl]=Replicode Comment[sr]=Репликод @@ -59,6 +62,7 @@ Comment[sr@ijekavianlatin]=Replicode Comment[sr@latin]=Replicode Comment[sv]=Replicode +Comment[tr]=Replicode Comment[uk]=Replicode Comment[x-test]=xxReplicodexx Comment[zh_TW]=Replicode @@ -81,6 +85,7 @@ GenericName[pl]=Replicode GenericName[pt]=Replicode GenericName[pt_BR]=Replicode +GenericName[ro]=Replicode GenericName[sk]=Replikovať GenericName[sl]=Replicode GenericName[sr]=Репликод @@ -88,6 +93,7 @@ GenericName[sr@ijekavianlatin]=Replicode GenericName[sr@latin]=Replicode GenericName[sv]=Replicode +GenericName[tr]=Replicode GenericName[uk]=Replicode GenericName[x-test]=xxReplicodexx GenericName[zh_TW]=Replicode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/kate/tabbarextension/katetabbarextension.desktop new/kate-4.13.1/addons/kate/tabbarextension/katetabbarextension.desktop --- old/kate-4.13.0/addons/kate/tabbarextension/katetabbarextension.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/kate/tabbarextension/katetabbarextension.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -47,7 +47,7 @@ Name[sr@latin]=Višeredna traka jezičaka Name[sv]=Flerraders flikrad Name[tg]=Панели бисёрсатра -Name[tr]=Çoksatırlı Sekme Çubuğu +Name[tr]=Çok Satırlı Sekme Çubuğu Name[ug]=كۆپ قۇرلۇق بەتكۈچ بالداق Name[uk]=Багаторядкова панель вкладок Name[x-test]=xxMultiline Tab Barxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/addons/ktexteditor/lumen/ktexteditor_lumen.desktop new/kate-4.13.1/addons/ktexteditor/lumen/ktexteditor_lumen.desktop --- old/kate-4.13.0/addons/ktexteditor/lumen/ktexteditor_lumen.desktop 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/addons/ktexteditor/lumen/ktexteditor_lumen.desktop 2014-05-09 10:43:33.000000000 +0200 @@ -36,6 +36,7 @@ Name[pl]=Lumen Name[pt]=Lumen Name[pt_BR]=Lumen +Name[ro]=Lumen Name[ru]=Lumen Name[sk]=Lumen Name[sl]=Lumen @@ -44,6 +45,7 @@ Name[sr@ijekavianlatin]=Lumen Name[sr@latin]=Lumen Name[sv]=Lumen +Name[tr]=Lumen Name[uk]=Lumen Name[x-test]=xxLumenxx Name[zh_CN]=Lumen @@ -77,6 +79,7 @@ Comment[sr@ijekavianlatin]=Lumen je priključak za samodopunu za D, preko DCD‑ovog servera Comment[sr@latin]=Lumen je priključak za samodopunu za D, preko DCD‑ovog servera Comment[sv]=Lumen insticksprogram för automatisk komplettering av D, som använder DCD-servern för automatisk komplettering +Comment[tr]=Lumen D için DCD otomatik tamamlama sunucusu kullanan Otomatik Tamamlama Eklentisi'dir. Comment[uk]=Lumen — додаток автоматичного доповнення коду мовою D, якому використано сервер доповнення DCD Comment[x-test]=xxLumen is a Autocompletion Plugin for D, using the DCD autocompletion serverxx Comment[zh_CN]=Lumen 是 D 语言自动补全插件，使用的是 DCD 自动补全服务器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/part/script/data/indentation/cppstyle.js new/kate-4.13.1/part/script/data/indentation/cppstyle.js --- old/kate-4.13.0/part/script/data/indentation/cppstyle.js 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/part/script/data/indentation/cppstyle.js 2014-05-09 10:43:33.000000000 +0200 @@ -1598,7 +1598,8 @@ // Remove just entered (redundant) one document.removeText(line, column - 1, line, column); } - else if (prev[1] == '.' && prev[2] == '.') // Append one more if only two here + // Append one more if only two here and we are in 'Normal Mode' + else if (prev[1] == '.' && prev[2] == '.' && document.defStyleNum(line, column) == 0) { addCharOrJumpOverIt(line, column, '.'); } // Otherwise, do nothing... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/part/syntax/data/cpp.xml new/kate-4.13.1/part/syntax/data/cpp.xml --- old/kate-4.13.0/part/syntax/data/cpp.xml 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/part/syntax/data/cpp.xml 2014-05-09 10:43:33.000000000 +0200 @@ -11,7 +11,7 @@ <language name="C++" section="Sources" - version="2.0" + version="2.1" kateversion="2.4" indenter="cstyle" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" @@ -230,8 +230,8 @@ <DetectIdentifier /> <!-- Match comments --> <IncludeRules context="##Doxygen" /> - <IncludeRules context="AlignedComments" /> - <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment" /> + <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/" /> + <Detect2Chars attribute="Comment" context="Comment 2" char="/" char1="*" beginRegion="Comment" /> <!-- Match scope regions --> <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" /> <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" /> @@ -333,7 +333,7 @@ <IncludeRules context="DetectNSEnd" /> </context> - <context name="Commentar 1" attribute="Comment" lineEndContext="#pop"> + <context name="Comment 1" attribute="Comment" lineEndContext="#pop"> <LineContinue attribute="Comment" context="#stay" /> <DetectSpaces /> <IncludeRules context="##Alerts" /> @@ -341,7 +341,7 @@ <DetectIdentifier /> </context> - <context name="Commentar 2" attribute="Comment" lineEndContext="#stay"> + <context name="Comment 2" attribute="Comment" lineEndContext="#stay"> <DetectSpaces /> <LineContinue attribute="Comment" context="#stay" /> <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment" /> @@ -367,8 +367,8 @@ <RangeDetect attribute="Prep. Lib" context="#stay" char=""" char1=""" /> <RangeDetect attribute="Prep. Lib" context="#stay" char="<" char1=">" /> <IncludeRules context="##Doxygen" /> - <Detect2Chars attribute="Comment" context="Commentar/Preprocessor" char="/" char1="*" beginRegion="Comment2" /> - <IncludeRules context="AlignedComments" /> + <Detect2Chars attribute="Comment" context="Comment/Preprocessor" char="/" char1="*" beginRegion="Comment2" /> + <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/" /> </context> <context name="Define" attribute="Preprocessor" lineEndContext="#pop"> @@ -378,7 +378,7 @@ <IncludeRules context="GNUMacros##GCCExtensions" /> </context> - <context name="Commentar/Preprocessor" attribute="Comment" lineEndContext="#stay"> + <context name="Comment/Preprocessor" attribute="Comment" lineEndContext="#stay"> <DetectSpaces /> <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="Comment2" /> <DetectIdentifier /> @@ -390,12 +390,12 @@ <IncludeRules context="##Modelines" /> <DetectIdentifier /> <IncludeRules context="##Doxygen" /> - <IncludeRules context="AlignedComments" /> + <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/" /> <!-- Do not try to detect "C" style comments inside outscoped text to prevent incorrect highlighting in case of overlapped (or not closed properly) comment block... - <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment" /> + <Detect2Chars attribute="Comment" context="Comment 2" char="/" char1="*" beginRegion="Comment" /> --> <RegExpr attribute="Comment" context="Outscoped intern" String="(#|%\:|\?\?=)\s*if" beginRegion="PP" firstNonSpace="true" insensitive="false" /> <LineContinue context="#stay" /> @@ -425,31 +425,11 @@ <IncludeRules context="##Modelines" /> <DetectIdentifier /> <IncludeRules context="##Doxygen" /> - <IncludeRules context="AlignedComments" /> - <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment" /> + <Detect2Chars attribute="Comment" context="Comment 1" char="/" char1="/" /> + <Detect2Chars attribute="Comment" context="Comment 2" char="/" char1="*" beginRegion="Comment" /> <RegExpr attribute="Comment" context="Outscoped intern" String="(#|%\:|\?\?=)\s*if" beginRegion="PP" firstNonSpace="true" insensitive="false" /> <RegExpr attribute="Comment" context="#pop" String="(#|%\:|\?\?=)\s*endif" endRegion="PP" firstNonSpace="true" insensitive="false" /> </context> - - <context name="AlignedComments" lineEndContext="#stay" attribute="Comment"> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="0" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="4" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="8" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="12" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="16" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="20" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="24" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="28" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="32" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="36" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="40" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="44" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="48" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="52" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="56" char="/" char1="/" /> - <Detect2Chars attribute="Region Marker" context="Commentar 1" column="60" char="/" char1="/" /> - <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/" /> - </context> </contexts> <itemDatas> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/part/syntax/data/debianchangelog.xml new/kate-4.13.1/part/syntax/data/debianchangelog.xml --- old/kate-4.13.0/part/syntax/data/debianchangelog.xml 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/part/syntax/data/debianchangelog.xml 2014-05-09 10:43:33.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE language SYSTEM "language.dtd"> -<language name="Debian Changelog" version="0.68" kateversion="2.4" section="Other" extensions="" mimetype=""> +<language name="Debian Changelog" version="0.69" kateversion="2.4" section="Other" extensions="" mimetype=""> <highlighting> <list name="keywords"> <item>urgency</item> @@ -130,6 +130,16 @@ <item>saucy-proposed</item> <item>saucy-updates</item> <item>saucy-backports</item> + <item>trusty</item> + <item>trusty-security</item> + <item>trusty-proposed</item> + <item>trusty-updates</item> + <item>trusty-backports</item> + <item>utopic</item> + <item>utopic-security</item> + <item>utopic-proposed</item> + <item>utopic-updates</item> + <item>utopic-backports</item> </list> <list name="urgencies"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/part/vimode/katevinormalmode.cpp new/kate-4.13.1/part/vimode/katevinormalmode.cpp --- old/kate-4.13.0/part/vimode/katevinormalmode.cpp 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/part/vimode/katevinormalmode.cpp 2014-05-09 10:43:33.000000000 +0200 @@ -1153,8 +1153,12 @@ // block substitute can be simulated by first deleting the text // (done above) and then starting block prepend. return commandPrependToBlock(); - } else + } else { + if (m_commandRange.startLine < m_commandRange.endLine) { + c.setLine(m_commandRange.startLine); + } c.setColumn(m_commandRange.startColumn); + } updateCursor(c); setCount(0); // The count was for the motion, not the insertion. @@ -1509,7 +1513,13 @@ m_viInputModeManager->clearCurrentChangeLog(); if (doc()->undoCount() > 0) { + const bool mapped = m_viInputModeManager->keyMapper()->isExecutingMapping(); + + if (mapped) + doc()->editEnd(); doc()->undo(); + if (mapped) + doc()->editBegin(); return true; } return false; @@ -1518,7 +1528,13 @@ bool KateViNormalMode::commandRedo() { if (doc()->redoCount() > 0) { + const bool mapped = m_viInputModeManager->keyMapper()->isExecutingMapping(); + + if (mapped) + doc()->editEnd(); doc()->redo(); + if (mapped) + doc()->editBegin(); return true; } return false; @@ -3447,6 +3463,7 @@ for (int i = r.endLine + 1; i < lines && doc()->line(i).isEmpty(); i++) { r.endLine++; } + r.endColumn = 0; } else { Cursor prev = m_view->cursorPosition(); Cursor c(r.endLine + 1, 0); @@ -3465,7 +3482,6 @@ updateCursor(Cursor(r.startLine, r.startColumn)); } else { // We went too far and we're on empty lines, do nothing. - updateCursor(original); return KateViRange::invalid(); } return r; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/part/vimode/katevireplacemode.cpp new/kate-4.13.1/part/vimode/katevireplacemode.cpp --- old/kate-4.13.0/part/vimode/katevireplacemode.cpp 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/part/vimode/katevireplacemode.cpp 2014-05-09 10:43:33.000000000 +0200 @@ -38,24 +38,28 @@ bool KateViReplaceMode::commandInsertFromLine( int offset ) { - KTextEditor::Cursor c( m_view->cursorPosition() ); - KTextEditor::Cursor c2( c.line(), c.column()+1 ); + KTextEditor::Cursor c(m_view->cursorPosition()); + KTextEditor::Cursor c2(c.line(), c.column() + 1); - if ( c.line()+offset > doc()->lines() || c.line()+offset < 0 ) { + if (c.line() + offset >= doc()->lines() || c.line() + offset < 0) { return false; } - QString line = doc()->line( c.line()+offset ); + QString line = doc()->line(c.line() + offset); int tabWidth = doc()->config()->tabWidth(); - QChar ch = getCharAtVirtualColumn( line, m_view->virtualCursorColumn(), tabWidth ); - QChar removed = doc()->line( c.line() ).at( c.column() ); + QChar ch = getCharAtVirtualColumn(line, m_view->virtualCursorColumn(), tabWidth); - if ( ch == QChar::Null ) { + if (ch == QChar::Null) { return false; } - if ( doc()->replaceText( KTextEditor::Range( c, c2 ), ch ) ) { - overwrittenChar( removed ); + if (c.column() == doc()->lineLength(c.line())) { + return doc()->insertText(c, ch); + } + + QChar removed = doc()->line(c.line()).at(c.column()); + if (doc()->replaceText(KTextEditor::Range(c, c2), ch)) { + overwrittenChar(removed); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/tests/data/indent/cppstyle/dot3/expected new/kate-4.13.1/tests/data/indent/cppstyle/dot3/expected --- old/kate-4.13.0/tests/data/indent/cppstyle/dot3/expected 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.13.1/tests/data/indent/cppstyle/dot3/expected 2014-05-09 10:43:33.000000000 +0200 @@ -0,0 +1,3 @@ +#include <../foo.hh> +auto literal = "some ... text"; +// comment... \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/tests/data/indent/cppstyle/dot3/input.js new/kate-4.13.1/tests/data/indent/cppstyle/dot3/input.js --- old/kate-4.13.0/tests/data/indent/cppstyle/dot3/input.js 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.13.1/tests/data/indent/cppstyle/dot3/input.js 2014-05-09 10:43:33.000000000 +0200 @@ -0,0 +1,17 @@ +// BUG: #333696 + +v.setCursorPosition(0,10); +v.type("."); +v.type("."); +v.type("/"); +v.type("foo.hh"); + +v.setCursorPosition(1,21); +v.type("."); +v.type("."); +v.type("."); + +v.setCursorPosition(2,10); +v.type("."); +v.type("."); +v.type("."); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/tests/data/indent/cppstyle/dot3/origin new/kate-4.13.1/tests/data/indent/cppstyle/dot3/origin --- old/kate-4.13.0/tests/data/indent/cppstyle/dot3/origin 1970-01-01 01:00:00.000000000 +0100 +++ new/kate-4.13.1/tests/data/indent/cppstyle/dot3/origin 2014-05-09 10:43:33.000000000 +0200 @@ -0,0 +1,3 @@ +#include <> +auto literal = "some text"; +// comment \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/tests/data/indent/cppstyle/doxygen8/expected new/kate-4.13.1/tests/data/indent/cppstyle/doxygen8/expected --- old/kate-4.13.0/tests/data/indent/cppstyle/doxygen8/expected 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/tests/data/indent/cppstyle/doxygen8/expected 2014-05-09 10:43:33.000000000 +0200 @@ -1 +1 @@ - /// ok \ No newline at end of file + // /ok \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kate-4.13.0/tests/vimode_test.cpp new/kate-4.13.1/tests/vimode_test.cpp --- old/kate-4.13.0/tests/vimode_test.cpp 2014-04-07 17:27:59.000000000 +0200 +++ new/kate-4.13.1/tests/vimode_test.cpp 2014-05-09 10:43:33.000000000 +0200 @@ -785,18 +785,50 @@ DoTest("Three. Different. Sentences.", "viscX", "X Different. Sentences."); DoTest("Three. Different. Sentences.", "vapcX", "X"); DoTest("Three. Different. Sentences.", "vipcX", "X"); + DoTest("Hello.\n", "vap\\esciX", "Hello.\nX"); + + // Get the range right. + DoTest("\n", "vjcX", "X"); + DoTest("Hello.\nWorld", "2lvjcX", "HeXld"); + DoTest("Three. Different. Sentences.\n\n", "vapcX", "X"); } void ViModeTest::ReplaceModeTests() { - // TODO - more of these! - DoTest("foo bar", "R\\ctrl-\\rightX", "foo Xar"); - DoTest("foo bar", "R\\ctrl-\\right\\ctrl-\\rightX", "foo barX"); - DoTest("foo bar", "R\\ctrl-\\leftX", "Xoo bar"); - DoTest("foo bar", "R\\ctrl-\\left\\delete", "oo bar"); + // Basic stuff. + DoTest("", "Rqwerty", "qwerty"); + DoTest("qwerty", "R\\rightXX", "qXXrty"); + + // Enter replace and go to the next/previous word. + DoTest("foo bar", "R\\ctrl-\\rightX", "foo Xar"); + DoTest("foo bar", "R\\ctrl-\\right\\ctrl-\\rightX", "foo barX"); + DoTest("foo bar", "R\\ctrl-\\leftX", "Xoo bar"); + DoTest("foo bar", "R\\ctrl-\\left\\delete", "oo bar"); + + // Enter replace mode and go up/down. + DoTest("foo\nbar\nbaz", "R\\downX", "foo\nXar\nbaz"); + DoTest("foo\nbar\nbaz", "jjR\\upX", "foo\nXar\nbaz"); + + // Backspace. + DoTest("", "R\\backspace", ""); + DoTest("qwerty", "lR\\backspaceX", "Xwerty"); + DoTest("qwerty", "lRX\\backspace\\backspaceX", "Xwerty"); + + // Ctrl-E: replace the current column with the column of the next line. + DoTest("", "R\\ctrl-e", ""); + DoTest("\n", "jR\\ctrl-e", "\n"); + DoTest("\nqwerty", "R\\ctrl-e\\ctrl-e", "qw\nqwerty"); + DoTest("a\nbb", "R\\ctrl-e\\ctrl-e", "bb\nbb"); + DoTest("aa\n b", "R\\ctrl-e\\ctrl-e", " b\n b"); + DoTest("\n\tb", "R\\ctrl-e\\ctrl-e", "\tb\n\tb"); + + // Ctrl-Y: replace the current column with the column of the previous line. + DoTest("", "R\\ctrl-y", ""); + DoTest("qwerty\n", "jR\\ctrl-y\\ctrl-y", "qwerty\nqw"); + DoTest("aa\nb", "jR\\ctrl-y\\ctrl-y", "aa\naa"); + DoTest(" a\nbb", "jR\\ctrl-y\\ctrl-y", " a\n a"); + DoTest("\tb\n", "jR\\ctrl-y\\ctrl-y", "\tb\n\tb"); - DoTest("foo\nbar\nbaz", "R\\downX", "foo\nXar\nbaz"); - DoTest("foo\nbar\nbaz", "jjR\\upX", "foo\nXar\nbaz"); } void ViModeTest::InsertModeTests() { @@ -2885,6 +2917,13 @@ QApplication::sendPostedEvents(); FinishTest("foo bar"); + // Mapping the u and the U commands to other keys. + clearAllMappings(); + KateGlobal::self()->viInputModeGlobal()->addMapping(KateViGlobal::NormalModeMapping, "t", "u", KateViGlobal::Recursive); + KateGlobal::self()->viInputModeGlobal()->addMapping(KateViGlobal::NormalModeMapping, "r", "U", KateViGlobal::Recursive); + DoTest("", "ihello\\esct", ""); + DoTest("", "ihello\\esctr", "hello"); + // Clear mappings for subsequent tests. clearAllMappings(); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
