BUG: [ 845012 ] SaveToFile does not write BOM

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 5b4a153..1b7d73d 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -1374,8 +1374,8 @@ BOOL CMergeDoc::CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
 
                if (m_unicoding != ucr::NONE)
                {
-                       ucr::writeBom(fileData.pMapBase, (ucr::UNICODESET)m_unicoding);
-                       ucr::convertToBuffer(text, fileData.pMapBase, (ucr::UNICODESET)m_unicoding, m_codepage);
+                       int bom_bytes = ucr::writeBom(fileData.pMapBase, (ucr::UNICODESET)m_unicoding);
+                       ucr::convertToBuffer(text, (char*)fileData.pMapBase+bom_bytes, (ucr::UNICODESET)m_unicoding, m_codepage);
                }
                else 
                {

diff --git a/Src/readme.txt b/Src/readme.txt
index 6db6d77..c4d8f58 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-11-19 Laoran
+ BUG: [ 845012 ] SaveToFile does not write BOM
+  WinMerge: MergeDoc.cpp
+
 2003-11-18 WinMerge beta 2.1.4.0 released
 
 2003-11-18 Laoran