Author: adgor Date: Wed Sep 20 11:07:34 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- Updated (3.5 branch freeze is started)
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.31 -> 1.32)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.31 SOURCES/kdelibs-branch.diff:1.32
--- SOURCES/kdelibs-branch.diff:1.31 Fri Sep 15 12:37:09 2006
+++ SOURCES/kdelibs-branch.diff Wed Sep 20 13:07:28 2006
@@ -1,7 +1,7 @@
Index: interfaces/kscript/sample/shellscript.desktop
===================================================================
---- interfaces/kscript/sample/shellscript.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ interfaces/kscript/sample/shellscript.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- interfaces/kscript/sample/shellscript.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ interfaces/kscript/sample/shellscript.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -15,7 +15,7 @@
Name[es]=Ejecutor de script para intĂŠrprete de comandos de bash
Name[et]=Bash shelli skripti käivitaja
@@ -40,8 +40,8 @@
Comment[pa]=ŕ¨ŕŠąŕ¨ ŕ¨ŕ¨žŕ¨°ŕ¨ ਵਿੱਠਬŕŠŕ¨ś ਜŕŠŕ¨˛
ਸŕ¨ŕŠŕ¨°ŕ¨żŕ¨Şŕ¨ŕ¨žŕ¨ ŕ¨ŕ¨˛ŕ¨žŕ¨ŕ¨Ł ਲਠਸਚਞŕ¨ŕ¨ ਚŕŠ
Index: interfaces/kscript/scriptinterface.desktop
===================================================================
---- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.4/kdelibs)
(revision 584592)
-+++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs)
(revision 584592)
+--- interfaces/kscript/scriptinterface.desktop (.../tags/KDE/3.5.4/kdelibs)
(revision 586512)
++++ interfaces/kscript/scriptinterface.desktop (.../branches/KDE/3.5/kdelibs)
(revision 586512)
@@ -18,7 +18,7 @@
Comment[es]=Este es un motor de script genĂŠrico para probar el interfaz de
script.
Comment[et]=Ăldise skriptimootori testskript liidese testimiseks.
@@ -53,8 +53,8 @@
Comment[fr]=Ceci est un moteur de script de test gĂŠnĂŠrique pour
expĂŠrimenter l'interface de script.
Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop
===================================================================
---- interfaces/kimproxy/interface/dcopinstantmessenger.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -17,6 +17,7 @@
Comment[es]=Instant Messenger con un interfaz DCOP
Comment[et]=Kiirsuhtlemisrakendus DCOP-liidesega
@@ -65,8 +65,8 @@
Comment[fy]=Instant Messenger mei in DCOP-interface
Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -10,6 +10,7 @@
Name[eo]=TujmesaÄilo
Name[et]=Kiirsuhtlus
@@ -85,8 +85,8 @@
Comment[fy]=Mei de instant messenger kinne jo twaspraak hâlde mei in
yndividu en groepen.
Index: interfaces/kspeech/dcoptexttospeech.desktop
===================================================================
---- interfaces/kspeech/dcoptexttospeech.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ interfaces/kspeech/dcoptexttospeech.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- interfaces/kspeech/dcoptexttospeech.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ interfaces/kspeech/dcoptexttospeech.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -16,6 +16,7 @@
Comment[es]=Texto a servicio de voz con un interfaz DCOP
Comment[et]=Teksti kĂľneks muutmise teenus DCOP-liidesega
@@ -97,8 +97,8 @@
Comment[fy]=tekst-ta-prate mei in DCOP-ynterface
Index: interfaces/ktexteditor/ktexteditoreditor.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditoreditor.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -20,7 +20,7 @@
Comment[es]=Componente incrustable de editor de textos (sin separaciĂłn
Doc/Vista)
Comment[et]=PĂľimitav tekstiredaktori komponent
@@ -110,8 +110,8 @@
Comment[fy]=Yn te sluten tekstbewurkerkomponint (sĂťnder skieding fan
tekst/werjefte)
Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
===================================================================
---- interfaces/ktexteditor/kcm_ktexteditor.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -90,7 +90,7 @@
Comment[es]=El servicio del editor de texto proporciona aplicaciones con un
visor de textos y un editor de textos. Las aplicaciones KDE que suministran
propiedades de ediciĂłn deberĂan utilizar este servicio.
Comment[et]=Tekstiredaktori teenus annab rakendustele komponendi teksti
vaatamiseks ja redigeerimiseks. Seda kasutavad kĂľik KDE rakendused, mis
tegelevad teksti redigeerimisega.
@@ -123,8 +123,8 @@
Comment[fr]=Le service d'ĂŠdition de texte fournit des applications
comportant un afficheur de texte et un ĂŠditeur. Les applications KDE qui
fournissent des fonctions d'ĂŠdition de texte devraient utiliser ce service.
Index: interfaces/ktexteditor/ktexteditor.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs)
(revision 584592)
-+++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs)
(revision 584592)
+--- interfaces/ktexteditor/ktexteditor.desktop (.../tags/KDE/3.5.4/kdelibs)
(revision 586512)
++++ interfaces/ktexteditor/ktexteditor.desktop (.../branches/KDE/3.5/kdelibs)
(revision 586512)
@@ -20,7 +20,7 @@
Comment[es]=Componente incrustable de editor de textos (con separaciĂłn
Doc/Vista)
Comment[et]=PĂľimitav tekstiredaktori komponent (dokument/vaade eraldamisega)
@@ -136,8 +136,8 @@
Comment[fy]=Yn te sluten tekstbewurkerkomponint (mei skieding fan
tekst/werjefte)
Index: interfaces/ktexteditor/ktexteditorplugin.desktop
===================================================================
---- interfaces/ktexteditor/ktexteditorplugin.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ interfaces/ktexteditor/ktexteditorplugin.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- interfaces/ktexteditor/ktexteditorplugin.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -22,7 +22,7 @@
Comment[es]=Plugin de KTextEditor
Comment[et]=KTextEditori plugin
@@ -149,8 +149,8 @@
Comment[fy]=KTextFerwurker-plugin
Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
===================================================================
---- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -17,7 +17,7 @@
Name[es]=Plugin KDataTool de KTextEditor
Name[et]=KTextEditori KDataTool plugin
@@ -171,8 +171,8 @@
Comment[fy]=Aktivearjen fan dataprogramma's, lykas de tesaurus en stavering
(wannear't dy ynstallearre binne)
Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
===================================================================
---- kate/plugins/insertfile/ktexteditor_insertfile.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -17,7 +17,7 @@
Name[es]=Plugin de inserciĂłn de archivos de KTextEditor
Name[et]=KTextEditori faili lisamise plugin
@@ -192,8 +192,8 @@
Comment[fy]=Els lĂŞsber Triem by it rinnerke ynfoegje
Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
===================================================================
---- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -14,6 +14,7 @@
Name[es]=Automarcadores de KTextEditor
Name[et]=KTextEditori järjehoidjate märkija
@@ -212,8 +212,8 @@
Comment[fy]=BlĂŞdwizer ynstelle om by it laden fan dokuminten oerienkomstige
patroanen
Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
===================================================================
---- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -13,6 +13,7 @@
Name[es]=Plugin de completado de palabras de KTextEditor
Name[et]=KTextEditori sĂľna lĂľpetamise plugin
@@ -241,8 +241,8 @@
Comment[fy]=kompleet meitsje fan wurden yn it dokumint op Direktsjeneel of
popup-basearje
Index: kate/plugins/isearch/ktexteditor_isearch.desktop
===================================================================
---- kate/plugins/isearch/ktexteditor_isearch.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 584592)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop
(.../branches/KDE/3.5/kdelibs) (revision 584592)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop
(.../tags/KDE/3.5.4/kdelibs) (revision 586512)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop
(.../branches/KDE/3.5/kdelibs) (revision 586512)
@@ -16,7 +16,7 @@
Name[es]=Plugin de bĂşsqueda incremental de KTextEditor
Name[et]=KTextEditori täpsustava otsingu plugin
@@ -260,10 +260,26 @@
Comment[fi]=Tunnetaan myÜs nimellä "Hae kun kirjoitat"
Comment[fr]=Aussi connu comme  Recherche pendant la saisie 
Comment[fy]=Ek bekend as"Ăťnder it typen sykje"
+Index: kate/part/katecodecompletion.cpp
+===================================================================
+--- kate/part/katecodecompletion.cpp (.../tags/KDE/3.5.4/kdelibs)
(revision 586512)
++++ kate/part/katecodecompletion.cpp (.../branches/KDE/3.5/kdelibs)
(revision 586512)
+@@ -137,6 +137,11 @@
+ this, SLOT(slotCursorPosChanged()) );
+ }
+
++KateCodeCompletion::~KateCodeCompletion()
++{
++ delete m_completionPopup;
++}
++
+ bool KateCodeCompletion::codeCompletionVisible () {
+ return m_completionPopup->isVisible();
+ }
Index: kate/part/kateconfig.h
===================================================================
---- kate/part/kateconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision
584592)
-+++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision
584592)
+--- kate/part/kateconfig.h (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/part/kateconfig.h (.../branches/KDE/3.5/kdelibs) (revision
586512)
@@ -178,7 +178,8 @@
cfReplaceTabsDyn= 0x2000000,
cfRemoveTrailingDyn=0x4000000,
@@ -276,8 +292,8 @@
uint configFlags () const;
Index: kate/part/katedocument.h
===================================================================
---- kate/part/katedocument.h (.../tags/KDE/3.5.4/kdelibs) (revision
584592)
-+++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision
584592)
+--- kate/part/katedocument.h (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/part/katedocument.h (.../branches/KDE/3.5/kdelibs) (revision
586512)
@@ -993,7 +993,12 @@
*/
static bool checkColorValue( QString value, QColor &col );
@@ -291,10 +307,22 @@
static QRegExp kvVar;
KIO::TransferJob *m_job;
+Index: kate/part/kateview.cpp
+===================================================================
+--- kate/part/kateview.cpp (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/part/kateview.cpp (.../branches/KDE/3.5/kdelibs) (revision
586512)
+@@ -173,7 +173,6 @@
+ m_doc->removeView( this );
+
+ delete m_viewInternal;
+- delete m_codeCompletion;
+
+ delete m_renderer;
+
Index: kate/part/katedocument.cpp
===================================================================
---- kate/part/katedocument.cpp (.../tags/KDE/3.5.4/kdelibs) (revision
584592)
-+++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision
584592)
+--- kate/part/katedocument.cpp (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/part/katedocument.cpp (.../branches/KDE/3.5/kdelibs) (revision
586512)
@@ -2895,8 +2895,8 @@
{
QChar end_ch;
@@ -316,7 +344,19 @@
{
editStart();
-@@ -4513,6 +4514,8 @@
+@@ -3248,8 +3249,10 @@
+ change = -adjustedChange;
+ }
+
++ const bool rts = config()->configFlags() &
KateDocumentConfig::cfRemoveTrailingDyn;
+ for (line = sl; (int) line <= el; line++) {
+- if (v->lineSelected(line) || v->lineHasSelected(line)) {
++ if ((v->lineSelected(line) || v->lineHasSelected(line))
++ && (!rts || lineLength(line) > 0)) {
+ optimizeLeadingSpace(line, config()->configFlags(), change);
+ }
+ }
+@@ -4513,6 +4516,8 @@
add view stuff
*/
QRegExp KateDocument::kvLine = QRegExp("kate:(.*)");
@@ -325,7 +365,7 @@
QRegExp KateDocument::kvVar = QRegExp("([\\w\\-]+)\\s+([^;]+)");
void KateDocument::readVariables(bool onlyViewAndRenderer)
-@@ -4552,122 +4555,171 @@
+@@ -4552,122 +4557,171 @@
void KateDocument::readVariableLine( QString t, bool onlyViewAndRenderer )
{
@@ -603,8 +643,8 @@
}
Index: kate/part/kateautoindent.h
===================================================================
---- kate/part/kateautoindent.h (.../tags/KDE/3.5.4/kdelibs) (revision
584592)
-+++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision
584592)
+--- kate/part/kateautoindent.h (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/part/kateautoindent.h (.../branches/KDE/3.5/kdelibs) (revision
586512)
@@ -67,8 +67,10 @@
* This baseclass is a real dummy, does nothing beside remembering the
document it belongs too,
* only to have the object around
@@ -680,7 +720,15 @@
public:
KatePythonIndent (KateDocument *doc);
~KatePythonIndent ();
-@@ -381,6 +394,8 @@
+@@ -373,6 +386,7 @@
+
+ private:
+ int calcExtra (int &prevBlock, int &pos, KateDocCursor &end);
++ void traverseString( const QChar &stringChar, KateDocCursor &cur,
KateDocCursor &end );
+
+ static QRegExp endWithColon;
+ static QRegExp stopStmt;
+@@ -381,6 +395,8 @@
class KateXmlIndent : public KateNormalIndent
{
@@ -689,7 +737,7 @@
public:
KateXmlIndent (KateDocument *doc);
~KateXmlIndent ();
-@@ -408,6 +423,8 @@
+@@ -408,6 +424,8 @@
class KateCSAndSIndent : public KateNormalIndent
{
@@ -698,7 +746,7 @@
public:
KateCSAndSIndent (KateDocument *doc);
~KateCSAndSIndent ();
-@@ -467,9 +484,10 @@
+@@ -467,9 +485,10 @@
* The idea is to provide a somewhat intelligent indentation for perl, php,
* bash, scheme and in general formats with humble indentation needs.
*/
@@ -710,7 +758,7 @@
public:
/**
* Purely for readability, couples we know and love
-@@ -519,6 +537,8 @@
+@@ -519,6 +538,8 @@
class KateScriptIndent : public KateNormalIndent
{
@@ -722,7 +770,7 @@
Index: kate/part/test_regression.h
===================================================================
--- kate/part/test_regression.h (.../tags/KDE/3.5.4/kdelibs)
(revision 0)
-+++ kate/part/test_regression.h (.../branches/KDE/3.5/kdelibs)
(revision 584592)
++++ kate/part/test_regression.h (.../branches/KDE/3.5/kdelibs)
(revision 586512)
@@ -0,0 +1,186 @@
+/**
+ * This file is part of the KDE project
@@ -912,8 +960,8 @@
+#endif
Index: kate/part/katedialogs.h
===================================================================
---- kate/part/katedialogs.h (.../tags/KDE/3.5.4/kdelibs) (revision
584592)
-+++ kate/part/katedialogs.h (.../branches/KDE/3.5/kdelibs) (revision
584592)
+--- kate/part/katedialogs.h (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/part/katedialogs.h (.../branches/KDE/3.5/kdelibs) (revision
586512)
@@ -122,7 +122,7 @@
void indenterSelected (int);
@@ -925,8 +973,8 @@
KIntNumInput *indentationWidth;
Index: kate/part/kateviewhelpers.cpp
===================================================================
---- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.4/kdelibs)
(revision 584592)
-+++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs)
(revision 584592)
+--- kate/part/kateviewhelpers.cpp (.../tags/KDE/3.5.4/kdelibs)
(revision 586512)
++++ kate/part/kateviewhelpers.cpp (.../branches/KDE/3.5/kdelibs)
(revision 586512)
@@ -583,7 +583,7 @@
".+++++++++.",
"..........."};
@@ -958,8 +1006,8 @@
uint endz = startz + 1 + (height / h);
Index: kate/part/kateconfig.cpp
===================================================================
---- kate/part/kateconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision
584592)
-+++ kate/part/kateconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision
584592)
+--- kate/part/kateconfig.cpp (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/part/kateconfig.cpp (.../branches/KDE/3.5/kdelibs) (revision
586512)
@@ -168,7 +168,8 @@
| KateDocumentConfig::cfKeepIndentProfile
| KateDocumentConfig::cfWrapCursor
@@ -972,8 +1020,8 @@
Index: kate/part/kateviewinternal.cpp
===================================================================
---- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.4/kdelibs)
(revision 584592)
-+++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs)
(revision 584592)
+--- kate/part/kateviewinternal.cpp (.../tags/KDE/3.5.4/kdelibs)
(revision 586512)
++++ kate/part/kateviewinternal.cpp (.../branches/KDE/3.5/kdelibs)
(revision 586512)
@@ -870,7 +870,10 @@
void KateViewInternal::updateMicroFocusHint()
{
@@ -1074,10 +1122,22 @@
selStartCached = m_view->selectStart;
selEndCached = m_view->selectEnd;
}
+Index: kate/part/katecodecompletion.h
+===================================================================
+--- kate/part/katecodecompletion.h (.../tags/KDE/3.5.4/kdelibs)
(revision 586512)
++++ kate/part/katecodecompletion.h (.../branches/KDE/3.5/kdelibs)
(revision 586512)
+@@ -72,6 +72,7 @@
+
+ public:
+ KateCodeCompletion(KateView *view);
++ ~KateCodeCompletion();
+
+ bool codeCompletionVisible ();
+
Index: kate/part/kateautoindent.cpp
===================================================================
---- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.4/kdelibs)
(revision 584592)
-+++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs)
(revision 584592)
+--- kate/part/kateautoindent.cpp (.../tags/KDE/3.5.4/kdelibs)
(revision 586512)
++++ kate/part/kateautoindent.cpp (.../branches/KDE/3.5/kdelibs)
(revision 586512)
@@ -31,6 +31,8 @@
#include <kdebug.h>
#include <kpopupmenu.h>
@@ -1186,11 +1246,11 @@
+ first = textLine->firstChar();
+ int indent = findOpeningComment(begin);
+ QString filler = tabString (indent);
-+
++
+ doc->removeText (begin.line(), 0, begin.line(), first);
+ doc->insertText (begin.line(), 0, filler);
+ begin.setCol(filler.length());
-+
++
+ return true;
+ }
}
@@ -1259,7 +1319,42 @@
}
-@@ -1494,7 +1540,7 @@
+@@ -1146,6 +1192,8 @@
+ extraIndent -= indentWidth;
+ else if (c == ':')
+ break;
++ else if (c == '\'' || c == '"' )
++ traverseString( c, cur, end );
+
+ if (c.isNull() || c == '#')
+ cur.gotoNextLine();
+@@ -1156,6 +1204,25 @@
+ return extraIndent;
+ }
+
++void KatePythonIndent::traverseString( const QChar &stringChar, KateDocCursor
&cur, KateDocCursor &end )
++{
++ QChar c;
++ bool escape = false;
++
++ cur.moveForward(1);
++ c = cur.currentChar();
++ while ( ( c != stringChar || escape ) && cur.line() < end.line() )
++ {
++ if ( escape )
++ escape = false;
++ else if ( c == '\\' )
++ escape = !escape;
++
++ cur.moveForward(1);
++ c = cur.currentChar();
++ }
++}
++
+ //END
+
+ //BEGIN KateXmlIndent
+@@ -1494,7 +1561,7 @@
bool doxygenAutoInsert = doc->config()->configFlags() &
KateDocumentConfig::cfDoxygenAutoTyping;
// starts with *: indent one space more to line up *s
@@ -1268,26 +1363,20 @@
indent = indent + " ";
// does not start with *: insert one if user wants that
else if ( doxygenAutoInsert )
-@@ -1538,44 +1584,62 @@
- * Does the line @p line start with a label?
- * @note May also return @c true if the line starts in a continuation.
+@@ -1540,42 +1607,60 @@
*/
--bool KateCSAndSIndent::startsWithLabel( int line )
--{
+ bool KateCSAndSIndent::startsWithLabel( int line )
+ {
- KateTextLine::Ptr indentLine = doc->plainKateTextLine( line );
-+bool KateCSAndSIndent::startsWithLabel( int line )
-+{
+ // Get the current line.
+ KateTextLine::Ptr indentLine = doc->plainKateTextLine(line);
const int indentFirst = indentLine->firstChar();
--
-+
+
+ // Not entirely sure what this check does.
int attrib = indentLine->attribute(indentFirst);
if (attrib != 0 && attrib != keywordAttrib && attrib != normalAttrib &&
attrib != extensionAttrib)
return false;
--
-+
+
+ // Get the line text.
const QString lineContents = indentLine->string();
- static const QString symbols = QString::fromLatin1(";:[]{}");
@@ -1360,7 +1449,7 @@
}
return false;
}
-@@ -1967,8 +2031,8 @@
+@@ -1967,8 +2052,8 @@
// is already the just typed '/', concatenate it to "*/".
if ( first != -1
&& textLine->getChar( first ) == '*'
@@ -1371,7 +1460,7 @@
}
// anders: don't change the indent of doxygen lines here.
-@@ -1990,7 +2054,7 @@
+@@ -1990,7 +2075,7 @@
};
KateVarIndent::KateVarIndent( KateDocument *doc )
@@ -1380,7 +1469,7 @@
{
d = new KateVarIndentPrivate;
d->reIndentAfter = QRegExp( doc->variable( "var-indent-indent-after" ) );
-@@ -2038,8 +2102,6 @@
+@@ -2038,8 +2123,6 @@
void KateVarIndent::processLine ( KateDocCursor &line )
{
@@ -1392,7 +1481,7 @@
Index: kate/part/test_regression.cpp
===================================================================
--- kate/part/test_regression.cpp (.../tags/KDE/3.5.4/kdelibs)
(revision 0)
-+++ kate/part/test_regression.cpp (.../branches/KDE/3.5/kdelibs)
(revision 584592)
++++ kate/part/test_regression.cpp (.../branches/KDE/3.5/kdelibs)
(revision 586512)
@@ -0,0 +1,1127 @@
+/**
+ * This file is part of the KDE project
@@ -2523,8 +2612,8 @@
+// kate: indent-width 4
Index: kate/part/katedialogs.cpp
===================================================================
---- kate/part/katedialogs.cpp (.../tags/KDE/3.5.4/kdelibs) (revision
584592)
-+++ kate/part/katedialogs.cpp (.../branches/KDE/3.5/kdelibs) (revision
584592)
+--- kate/part/katedialogs.cpp (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/part/katedialogs.cpp (.../branches/KDE/3.5/kdelibs) (revision
586512)
@@ -140,7 +140,8 @@
KateDocument::cfTabIndents,
KateDocument::cfBackspaceIndents,
@@ -2569,10 +2658,19 @@
connect(indentationWidth, SIGNAL(valueChanged(int)), this,
SLOT(slotChanged()));
+@@ -1692,6 +1699,8 @@
+ i18n("The diff command failed. Please make sure that "
+ "diff(1) is installed and in your PATH."),
+ i18n("Error Creating Diff") );
++ delete m_tmpfile;
++ m_tmpfile = 0;
+ return;
+ }
+
Index: kate/part/Makefile.am
===================================================================
---- kate/part/Makefile.am (.../tags/KDE/3.5.4/kdelibs) (revision
584592)
-+++ kate/part/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision
584592)
+--- kate/part/Makefile.am (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/part/Makefile.am (.../branches/KDE/3.5/kdelibs) (revision
586512)
@@ -1,6 +1,8 @@
kde_module_LTLIBRARIES = libkatepart.la
@@ -2615,8 +2713,8 @@
+testkateregression_LDADD = $(libkatepart_la_LIBADD)
Index: kate/scripts/jstest.desktop
===================================================================
---- kate/scripts/jstest.desktop (.../tags/KDE/3.5.4/kdelibs)
(revision 584592)
-+++ kate/scripts/jstest.desktop (.../branches/KDE/3.5/kdelibs)
(revision 584592)
+--- kate/scripts/jstest.desktop (.../tags/KDE/3.5.4/kdelibs)
(revision 586512)
++++ kate/scripts/jstest.desktop (.../branches/KDE/3.5/kdelibs)
(revision 586512)
@@ -9,6 +9,7 @@
Name[es]=Prueba JavaScript de Kate Part
Name[et]=Kate komponendi JavaScripti test
@@ -2635,8 +2733,8 @@
Comment[fy]=Skript foar it testen fan Kate-part's skriptmooglikheid
Index: kate/data/katepart.desktop
===================================================================
---- kate/data/katepart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision
584592)
-+++ kate/data/katepart.desktop (.../branches/KDE/3.5/kdelibs) (revision
584592)
+--- kate/data/katepart.desktop (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/data/katepart.desktop (.../branches/KDE/3.5/kdelibs) (revision
586512)
@@ -18,7 +18,7 @@
Name[es]=Editor de texto avanzado empotrable
Name[et]=PĂľimitud vĂľimas tekstiredaktor
@@ -2648,14 +2746,14 @@
Name[fy]=Ynsletten avansearre tekstbewurker
Index: kate/data/latex.xml
===================================================================
---- kate/data/latex.xml (.../tags/KDE/3.5.4/kdelibs) (revision
584592)
-+++ kate/data/latex.xml (.../branches/KDE/3.5/kdelibs) (revision
584592)
-@@ -1,123 +1,274 @@
+--- kate/data/latex.xml (.../tags/KDE/3.5.4/kdelibs) (revision
586512)
++++ kate/data/latex.xml (.../branches/KDE/3.5/kdelibs) (revision
586512)
+@@ -1,123 +1,287 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.01" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
-<language name="LaTeX" version="1.14" section="Markup" kateversion="2.4"
extensions="*.tex; *.ltx; *.dtx; *.sty; *.cls;" mimetype="text/x-tex"
casesensitive="1" author="Jeroen Wijnhout ([EMAIL PROTECTED])" license="LGPL" >
-+<language name="LaTeX" version="1.22" section="Markup" kateversion="2.3"
extensions="*.tex; *.ltx; *.dtx; *.sty; *.cls;" mimetype="text/x-tex"
casesensitive="1" author="Jeroen Wijnhout ([EMAIL PROTECTED])+Holger Danielsson
([EMAIL PROTECTED])+Michel Ludwig ([EMAIL PROTECTED])" license="LGPL" >
++<language name="LaTeX" version="1.23" section="Markup" kateversion="2.3"
extensions="*.tex; *.ltx; *.dtx; *.sty; *.cls;" mimetype="text/x-tex"
casesensitive="1" author="Jeroen Wijnhout ([EMAIL PROTECTED])+Holger Danielsson
([EMAIL PROTECTED])+Michel Ludwig ([EMAIL PROTECTED])" license="LGPL" >
<highlighting>
<contexts>
+ <!-- Normal text -->
@@ -2734,11 +2832,24 @@
+ </context>
+
+ <!-- label -->
-+ <context name="Label" attribute="Normal Text" lineEndContext="#pop#pop"
fallthrough="true" fallthroughContext="#pop#pop">
-+ <RegExpr String="\s*\{\s*" attribute="Normal Text" context="#stay"/>
++ <context name="Label" attribute="Normal Text" lineEndContext="#stay">
++ <RegExpr String="\s*\{\s*" attribute="Normal Text"
context="LabelParameter"/>
++ <RegExpr String="\s*\[\s*" attribute="Normal Text"
context="LabelOption"/>
++ <RegExpr String="[^\[\{]+" attribute="Error" context="#stay"/>
++ </context>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.31&r2=1.32&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
