branches/KDE/3.5/kdesdk/kompare
Kevin Kofler
kevin.kofler at chello.at
Wed Dec 19 09:15:13 CET 2007
SVN commit 750422 by kkofler:
Don't reset encoding to "Default" for no good reason, it breaks diffs of e.g. UTF-8 files. Thanks to George Goldberg <grundleborg at googlemail.com>.
CCMAIL: kompare-devel at kde.org
CCMAIL: grundleborg at googlemail.com
(backport rev 750413 from trunk)
M +0 -4 kompare_shell.cpp
--- branches/KDE/3.5/kdesdk/kompare/kompare_shell.cpp #750421:750422
@@ -192,7 +192,6 @@
{
kdDebug(8102) << "Url = " << url.prettyURL() << endl;
m_diffURL = url;
- m_viewPart->setEncoding( "Default" );
m_viewPart->openDiff( url );
}
@@ -207,7 +206,6 @@
file.close();
- m_viewPart->setEncoding( "Default" );
m_viewPart->openDiff( diff );
}
@@ -217,7 +215,6 @@
m_sourceURL = source;
m_destinationURL = destination;
- m_viewPart->setEncoding( "Default" );
m_viewPart->compare( source, destination );
}
@@ -226,7 +223,6 @@
m_sourceURL = url1;
m_destinationURL = diff;
- m_viewPart->setEncoding( "Default" );
m_viewPart->openDirAndDiff( url1, diff );
}
More information about the Kompare-devel
mailing list