fix the tabs

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 050db21..d5893e9 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -271,6 +271,9 @@ void CMainFrame::ShowMergeDoc(LPCTSTR szLeft, LPCTSTR szRight)
                        split_filename(szRight, NULL, name, ext);
                        m_pRight->SetTextType(ext);
                        
+                       // SetTextType will revert to language dependent defaults for tab
+                       m_pLeft->SetTabSize(mf->m_nTabSize);
+                       m_pRight->SetTabSize(mf->m_nTabSize);
                        
                        // set the frame window header
                        CChildFrame *pf = static_cast<CChildFrame *>(m_pMergeDoc->m_pView->GetParentFrame());

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index c1062ac..1b5e52d 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -380,6 +380,10 @@ BOOL CMergeDoc::Rescan()
                                mf->m_pLeft->PrimeListWithFile(m_strTempLeftFile);
                                mf->m_pRight->PrimeListWithFile(m_strTempRightFile);
 
+                               // PrimeListWithFile will call resetview which resets tabs
+                               mf->m_pLeft->SetTabSize(mf->m_nTabSize);
+                               mf->m_pRight->SetTabSize(mf->m_nTabSize);
+
                                int lcnt = mf->m_pLeft->GetLineCount();
                                int rcnt = mf->m_pRight->GetLineCount();
                                /*TODO: if (lcnt < rcnt)