BUG: [ 728173 ] Autoscroll first diff breaks syntax hilight

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index c43a570..67cc14a 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -1201,6 +1201,10 @@ BOOL CMergeDoc::CDiffTextBuffer::LoadFromFile(LPCTSTR pszFileName,
                m_nSyncPosition = m_nUndoPosition = 0;
                ASSERT(m_aUndoBuf.GetSize() == 0);
                
+               // This is needed: Syntax hilighting does not work when
+               // automatically scroll to first diff is enabled
+               RetypeViews(pszFileName);
+
                UpdateViews(NULL, NULL, UPDATE_RESET);
                m_ptLastChange.x = m_ptLastChange.y = -1;
                bSuccess = TRUE;

diff --git a/Src/readme.txt b/Src/readme.txt
index 6eec77a..29d575a 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-04-27 Kimmo
+ BUG: [ 728173 ] Autoscroll first diff breaks syntax hilight
+  WinMerge: MergeDoc.cpp
+
 2003-04-26 Kimmo
  PATCH: [ 726330 ] Saving before refresh
   WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp