[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/kompare/libdiff2
From:       Otto Bruggeman <bruggie () gmail ! com>
Date:       2009-03-11 0:09:36
Message-ID: 1236730176.421342.11164.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 938013 by bruggie:

BUG: 139209 This is the best approach to fixing this bug. Thanks to Olivier Trichet \
for supplying the patch 2 years and almost 3 months ago :(. Sorry for this incredible \
long time.

 M  +3 -1      parserbase.cpp  


--- trunk/KDE/kdesdk/kompare/libdiff2/parserbase.cpp #938012:938013
@@ -520,7 +520,9 @@
 
 	QChar first = line[0];
 
-	return ( first == context || first == added || first == removed );
+	return (    (first == context)
+	         || ( (first == removed) && !m_unifiedDiffHeader1.exactMatch(line) )
+	         || ( (first == added)   && !m_unifiedDiffHeader2.exactMatch(line) )  );
 }
 
 bool ParserBase::parseUnifiedHunkBody()


[prev in list] [next in list] [prev in thread] [next in thread]