[ 794345 ] make visible the changed text when undo/redo

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 34def0c..a96a2a9 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -484,6 +484,7 @@ void CMergeEditView::OnEditUndo()
        CMergeEditView *tgt = *(pDoc->curUndo-1);
        if(tgt==this)
        {
+               GetParentFrame()->SetActiveView(this, TRUE);
                if(CCrystalEditViewEx::OnEditUndo()) 
                {
                        --pDoc->curUndo;
@@ -782,6 +783,7 @@ void CMergeEditView::OnEditRedo()
        CMergeEditView *tgt = *(pDoc->curUndo);
        if(tgt==this)
        {
+               GetParentFrame()->SetActiveView(this, TRUE);
                if(CCrystalEditViewEx::OnEditRedo()) 
                {
                        ++pDoc->curUndo;

diff --git a/Src/readme.txt b/Src/readme.txt
index 811b070..3a32880 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-08-28 Laoran
+ PATCH: [ 794345 ] make visible the changed text when undo/redo
+  WinMerge: MergeEditView.cpp
+
 2003-08-27 Perry
  i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
   Languages: Czech, Danish, Dutch