OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be3b348
)
MergeDoc.cpp: Fix incorrect in-line diff coloring after swapping panes
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Mon, 17 Jul 2017 12:47:57 +0000
(21:47 +0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Mon, 17 Jul 2017 12:47:57 +0000
(21:47 +0900)
Src/MergeDoc.cpp
patch
|
blob
|
history
diff --git
a/Src/MergeDoc.cpp
b/Src/MergeDoc.cpp
index
dec49f7
..
e445788
100644
(file)
--- a/
Src/MergeDoc.cpp
+++ b/
Src/MergeDoc.cpp
@@
-2973,6
+2973,8
@@
void CMergeDoc::SwapFiles()
m_diffList.Swap(0, m_nBuffers - 1);
swap(m_pView[0]->m_piMergeEditStatus, m_pView[m_nBuffers - 1]->m_piMergeEditStatus);
+ ClearWordDiffCache();
+
for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
{
m_ptBuf[nBuffer]->m_nThisPane = nBuffer;