PATCH: [ 763817 ] Hilight diffs when syntax hilight is off

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 4fc5b09..d7d7cc1 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -176,15 +176,6 @@ void CMergeEditView::OnActivateView(BOOL bActivate, CView* pActivateView, CView*
 void CMergeEditView::GetLineColors(int nLineIndex, COLORREF & crBkgnd,
                                 COLORREF & crText, BOOL & bDrawWhitespace)
 {
-       // If no syntax hilighting
-       if (!theApp.m_bHiliteSyntax)
-       {
-               crBkgnd = RGB(255, 255, 255);
-               crText = RGB(0, 0, 0);
-               bDrawWhitespace = FALSE;
-               return;
-       }
-
        DWORD dwLineFlags = GetLineFlags(nLineIndex);
        
        // Line inside diff
@@ -234,9 +225,17 @@ void CMergeEditView::GetLineColors(int nLineIndex, COLORREF & crBkgnd,
        }
        else
        {
-               // Line not inside diff, get colors from CrystalEditor
-               CCrystalEditViewEx::GetLineColors(nLineIndex, crBkgnd,
-                       crText, bDrawWhitespace);
+               // If no syntax hilighting
+               if (!theApp.m_bHiliteSyntax)
+               {
+                       crBkgnd = RGB(255, 255, 255);
+                       crText = RGB(0, 0, 0);
+                       bDrawWhitespace = FALSE;
+               }
+               else
+                       // Line not inside diff, get colors from CrystalEditor
+                       CCrystalEditViewEx::GetLineColors(nLineIndex, crBkgnd,
+                               crText, bDrawWhitespace);
        }
 }
 

diff --git a/Src/readme.txt b/Src/readme.txt
index aebc7e4..2b1e263 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-07-02 Kimmo
+ PATCH: [ 763817 ] Hilight diffs when syntax hilight is off
+  WinMerge: MergeEditView.cpp
+
 2003-06-30 Perry
  PATCH: [ 762835 ] Display line number etc beneath editor
   WinMerge: ChildFrm.cpp ChildFrm.h DirFrame.cpp Merge.cpp Merge.dsp