Fix issue #2080: Ignoring carriage return differences doesn't work an…

…ymore
WinMerge · Nov 2, 2023 · e1709e5 · e1709e5
1 parent a656175
commit e1709e5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Src/CompareEngines/Wrap_DiffUtils.cpp b/Src/CompareEngines/Wrap_DiffUtils.cpp
@@ -51,7 +51,7 @@ void DiffUtils::SetCompareOptions(const CompareOptions& options)
 {
 	DIFFOPTIONS doptions;
 	static_cast<const DiffutilsOptions&>(options).GetAsDiffOptions(doptions);
-	m_pDiffWrapper->SetOptions(&doptions);
+	m_pDiffWrapper->SetOptions(&doptions, true);
 }
 
 /**

diff --git a/Src/DiffWrapper.cpp b/Src/DiffWrapper.cpp
@@ -141,11 +141,13 @@ void CDiffWrapper::GetOptions(DIFFOPTIONS *options) const
  * internally and stores them.
  * @param [in] options Pointer to structure having new options.
  */
-void CDiffWrapper::SetOptions(const DIFFOPTIONS *options)
+void CDiffWrapper::SetOptions(const DIFFOPTIONS *options, bool setToDiffutils)
 {
 	assert(options != nullptr);
 	m_options.SetFromDiffOptions(*options);
 	m_xdlFlags = make_xdl_flags(m_options);
+	if (setToDiffutils)
+		m_options.SetToDiffUtils();
 }
 
 void CDiffWrapper::SetPrediffer(const PrediffingInfo * prediffer /*= nullptr*/)

diff --git a/Src/DiffWrapper.h b/Src/DiffWrapper.h
@@ -164,7 +164,7 @@ class CDiffWrapper
 	void SetCreateDiffList(DiffList *diffList);
 	void GetOptions(DIFFOPTIONS *options) const;
 	const DiffutilsOptions& GetOptions() const { return m_options; }
-	void SetOptions(const DIFFOPTIONS *options);
+	void SetOptions(const DIFFOPTIONS *options, bool setToDiffutils = false);
 	void SetTextForAutomaticPrediff(const String &text);
 	void SetPrediffer(const PrediffingInfo * prediffer = nullptr);
 	void GetPrediffer(PrediffingInfo * prediffer) const;

diff --git a/Src/FolderCmp.cpp b/Src/FolderCmp.cpp
@@ -256,7 +256,7 @@ int FolderCmp::prepAndCompareFiles(DIFFITEM &di)
 
 				diffList.Clear();
 				dw.SetCompareFiles(tFiles);
-				dw.SetOptions(m_pCtxt->GetOptions());
+				dw.SetOptions(m_pCtxt->GetOptions(), true);
 				dw.SetFilterList(m_pCtxt->m_pFilterList);
 				dw.SetSubstitutionList(m_pCtxt->m_pSubstitutionList);
 				dw.SetFilterCommentsSourceDef(Ext);