From dc3074b0cd3532286e45198dd44fc047990c362b Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Wed, 28 Oct 2015 19:24:51 +0300
Subject: [PATCH] IDEA-146998 diff: allow to change default settings in 'old
 diff'

was broken by f9174b7
---
 .../com/intellij/openapi/diff/impl/DiffPanelImpl.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
index 9561c5cb7147..1ccf842898cd 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
@@ -181,13 +181,15 @@ public class DiffPanelImpl implements DiffPanelEx, ContentChangeListener, TwoSid
     myPanel.setDataProvider(myDataProvider);
 
     ComparisonPolicy comparisonPolicy = getComparisonPolicy();
-    if (comparisonPolicy != DiffManagerImpl.getInstanceEx().getComparisonPolicy()) {
-      setComparisonPolicy(comparisonPolicy);
+    ComparisonPolicy defaultComparisonPolicy = DiffManagerImpl.getInstanceEx().getComparisonPolicy();
+    if (comparisonPolicy != defaultComparisonPolicy) {
+      setComparisonPolicy(defaultComparisonPolicy, false);
     }
 
     HighlightMode highlightMode = getHighlightMode();
-    if (highlightMode != DiffManagerImpl.getInstanceEx().getHighlightMode()) {
-      setHighlightMode(highlightMode);
+    HighlightMode defaultHighlightMode = DiffManagerImpl.getInstanceEx().getHighlightMode();
+    if (highlightMode != defaultHighlightMode) {
+      setHighlightMode(defaultHighlightMode, false);
     }
 
     myVisibleAreaListener = new VisibleAreaListener() {