From: Jochen Tucht <jtuc@users.sourceforge.net>
Date: Sun, 10 Feb 2008 12:10:44 +0000 (+0000)
Subject: Patch #1880711 - Fix escape key
X-Git-Tag: 2.16.5~3615
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=42449ca7d1ac452ba235134ca5c4c7ca875c91bf;p=winmerge-jp%2Fwinmerge-jp.git

Patch #1880711 - Fix escape key
---

diff --git a/Src/editlib/ccrystaleditview.cpp b/Src/editlib/ccrystaleditview.cpp
index 2ba118551..dbf2ce982 100644
--- a/Src/editlib/ccrystaleditview.cpp
+++ b/Src/editlib/ccrystaleditview.cpp
@@ -504,7 +504,9 @@ OnChar (UINT nChar, UINT nRepCnt, UINT nFlags)
     }
   // Accept control characters other than [\t\n\r] through Alt-Numpad
   if (nChar > 31
-  || GetKeyState(VK_CONTROL) >= 0 && nChar != 9 && nChar != 10 && nChar != 13)
+  || GetKeyState(VK_CONTROL) >= 0 &&
+      (nChar != 27 || GetKeyState(VK_ESCAPE) >= 0) &&
+      nChar != 9 && nChar != 10 && nChar != 13)
     {
       if (QueryEditable () && m_pTextBuffer != NULL)
         {