Revert revisions 7086 and 7089 to fix the regression.
Installer: Embed MS runtime files installer for x64 (r7150)
Bugfix: Compare by size always checked file times too (#2919510)
Bugfix: Line filtering wasted huge amounts of memory (#3014162)
+ Bugfix: Difference blocks not cleared after merging (#2995925)
Translation updates:
- Japanese (r7153)
Bugfix: Pane headers not updated after language change (#2923684)
Bugfix: File panes become unaligned when last line didn't have
an EOL byte (#2922517)
- Bugfix: Automatic rescanning was not disabled everywhere (r7086,r7089)
Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
Translation updates:
- Slovenian (#2917796, #2932094)
}
BOOL bBinary = FALSE;
- nRescanResult = Rescan(bBinary, bIdentical, TRUE);
+ nRescanResult = Rescan(bBinary, bIdentical);
// Open filed if rescan succeed and files are not binaries
if (nRescanResult == RESCAN_OK)
void SetMergingMode(bool bMergingMode);
void SetDetectMovedBlocks(bool bDetectMovedBlocks);
bool IsMixedEOL(int nBuffer) const;
- void SetAutomaticRescan(bool bRescan) { m_bEnableRescan = bRescan; }
// implementation methods
private:
{
bool bOldValue = m_bAutomaticRescan;
m_bAutomaticRescan = bEnable;
- GetDocument()->SetAutomaticRescan(m_bAutomaticRescan);
return bOldValue;
}
void CMergeEditView::RefreshOptions()
{
m_bAutomaticRescan = GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN);
- GetDocument()->SetAutomaticRescan(m_bAutomaticRescan);
if (GetOptionsMgr()->GetInt(OPT_TAB_TYPE) == 0)
SetInsertTabs(true);