[Winmerge-svn] SF.net SVN: winmerge: [4195] trunk/Src

[<ga...@us...>]

Revision: 4195
          http://svn.sourceforge.net/winmerge/?rev=4195&view=rev
Author:   galh
Date:     2007-03-26 01:39:34 -0700 (Mon, 26 Mar 2007)

Log Message:
-----------
BUG: [ 1639453 ] Imaginary difference highlighted in character level mode

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/stringdiffs.cpp

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2007-03-25 21:44:27 UTC (rev 4194)
+++ trunk/Src/Changes.txt	2007-03-26 08:39:34 UTC (rev 4195)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2007-03-26 Gal
+ BUG: [ 1639453 ] Imaginary difference highlighted in character level mode
+  Src: stringdiffs.cpp
+
 2007-03-25 Tim
  PATCH: [ 1687661 ] Remove ICONS and BITMAPS from lang files
   Src/Languages/*: Merge*.rc

Modified: trunk/Src/stringdiffs.cpp
===================================================================
--- trunk/Src/stringdiffs.cpp	2007-03-25 21:44:27 UTC (rev 4194)
+++ trunk/Src/stringdiffs.cpp	2007-03-26 08:39:34 UTC (rev 4195)
@@ -196,7 +196,7 @@
 inspace:
 	if (i==str.GetLength())
 		return;
-	if (isSafeWhitespace(str[i])) 
+	if (isSafeWhitespace(str[i]) || isWordBreak(m_breakType, str[i]))
 	{
 		++i;
 		goto inspace;
@@ -207,7 +207,7 @@
 	// state when we are inside a word
 inword:
 	bool atspace=false;
-	if (i==str.GetLength() || (atspace=isSafeWhitespace(str[i])) || isWordBreak(m_breakType, str[i]))
+	if (i==str.GetLength() || (atspace=isSafeWhitespace(str[i])) || (atspace=isWordBreak(m_breakType, str[i])))
 	{
 		if (begin<i)
 		{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.