### Eclipse Workspace Patch 1.0 #P org.eclipse.compare Index: compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java,v retrieving revision 1.265 diff -u -r1.265 TextMergeViewer.java --- compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java 25 Sep 2009 13:52:36 -0000 1.265 +++ compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java 8 Oct 2009 00:54:09 -0000 @@ -2818,7 +2818,14 @@ fLeftContributor.setEncodingIfAbsent(fRightContributor); fRightContributor.setEncodingIfAbsent(fLeftContributor); fAncestorContributor.setEncodingIfAbsent(fLeftContributor); - + + if (!isConfigured) { + configureSourceViewer(fAncestor.getSourceViewer(), false); + configureSourceViewer(fLeft.getSourceViewer(), cc.isLeftEditable() && cp.isLeftEditable(input)); + configureSourceViewer(fRight.getSourceViewer(), cc.isRightEditable() && cp.isRightEditable(input)); + isConfigured = true; // configure once + } + // set new documents fLeftContributor.setDocument(fLeft, cc.isLeftEditable() && cp.isLeftEditable(input)); fLeftLineCount= fLeft.getLineCount(); @@ -2827,13 +2834,6 @@ fRightLineCount= fRight.getLineCount(); fAncestorContributor.setDocument(fAncestor, false); - - if (!isConfigured) { - configureSourceViewer(fAncestor.getSourceViewer(), false); - configureSourceViewer(fLeft.getSourceViewer(), cc.isLeftEditable() && cp.isLeftEditable(input)); - configureSourceViewer(fRight.getSourceViewer(), cc.isRightEditable() && cp.isRightEditable(input)); - isConfigured = true; // configure once - } //if the input is part of a patch hunk, toggle synchronized scrolling /*if (isPatchHunk()){