From 6eb23edd00acefd0fab01786795c63bf9e2e8685 Mon Sep 17 00:00:00 2001
From: Alexey Pegov <alexey.pegov@jetbrains.com>
Date: Mon, 18 Oct 2010 14:58:24 +0400
Subject: [PATCH] IDEA-55783 Diff window does not allow for win-W to close the
 window

---
 .../intellij/openapi/diff/impl/external/FrameDiffTool.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/FrameDiffTool.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/FrameDiffTool.java
index 180e25eda428..fd6f7ef55e7a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/FrameDiffTool.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/FrameDiffTool.java
@@ -58,7 +58,7 @@ class FrameDiffTool implements DiffTool {
         public void actionPerformed(final AnActionEvent e) {
           builder.getDialogWrapper().close(0);
         }
-      }.registerCustomShortcutSet(new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("CloseEditor")),
+      }.registerCustomShortcutSet(new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("CloseContent")),
                                   diffPanel.getComponent());
       showDiffDialog(builder, hints);
     } else {
@@ -72,7 +72,7 @@ class FrameDiffTool implements DiffTool {
         public void actionPerformed(final AnActionEvent e) {
           frameWrapper.getFrame().dispose();
         }
-      }.registerCustomShortcutSet(new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("CloseEditor")),
+      }.registerCustomShortcutSet(new CustomShortcutSet(KeymapManager.getInstance().getActiveKeymap().getShortcuts("CloseContent")),
                                   diffPanel.getComponent());
 
       frameWrapper.show();