OSDN Git Service

BUG: [ 1900257 ] No comparing of new files
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Mon, 25 Feb 2008 14:52:54 +0000 (14:52 +0000)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Mon, 25 Feb 2008 14:52:54 +0000 (14:52 +0000)
Docs/Users/ChangeLog.txt
Src/MergeDoc.cpp

index bd41406..d82c25a 100644 (file)
@@ -7,6 +7,7 @@ WinMerge 2.7.7.6
   BugFix: Ignore codepage specified on File Encoding dialog if file was 
     detected as UTF-8 (#1900728)
   BugFix: Recognize invalid UTF-8 sequence as UTF-8 (#1900733)
+  BugFix: Didn't highlight any difference between untitled documents (#1900257)
   Translation updates:
   - Japanese (r5076)
 
index 3315e81..47ae939 100644 (file)
@@ -2809,6 +2809,7 @@ DWORD CMergeDoc::LoadOneFile(int index, String filename, BOOL readOnly,
                m_nBufferType[index] = BUFFER_UNNAMED;
                m_ptBuf[index]->InitNew();
                m_strDesc[index] = GetMainFrame()->m_strDescriptions[index];
+               m_ptBuf[index]->m_encoding = encoding;
                loadSuccess = FileLoadResult::FRESULT_OK;
        }
        return loadSuccess;