From 98406e3e184652116267588cde2e5978ede373a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Aum=C3=BCller?= Date: Thu, 18 Mar 2010 13:15:58 +0100 Subject: [PATCH] Revert "fakevim: fix QTCREATORBUG-880" This reverts commit 81ff5cda95bee3f39770e6010359d9a68a91f610, except for the addition of '_' as a synonym for '^'. Further commits have a different kind of fix that maintains that Escape always takes one back to the editor. Merge-request: 131 Reviewed-by: hjk --- src/plugins/fakevim/fakevimhandler.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 148706b4cea..3f8e732a2a0 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -591,8 +591,9 @@ bool FakeVimHandler::Private::wantsOverride(QKeyEvent *ev) if (key == Key_Escape || (mods == Qt::ControlModifier && key == Key_BracketLeft)) { // Not sure this feels good. People often hit Esc several times - //return !isNoVisualMode() || m_mode != CommandMode; - return !m_passing; + if (isNoVisualMode() && m_mode == CommandMode) + return false; + return true; } // We are interested in overriding most Ctrl key combinations @@ -1924,7 +1925,7 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified, removeSelectedText(); } else if (key == Key_BracketLeft || key == Key_BracketRight) { - } else if (key == Key_Escape || key == 379 /* ^[ */) { + } else if (key == Key_Escape) { if (isVisualMode()) { leaveVisualMode(); } else if (m_submode != NoSubMode) { @@ -2126,7 +2127,7 @@ EventResult FakeVimHandler::Private::handleMiniBufferModes(int key, int unmodifi { Q_UNUSED(text) - if (key == Key_Escape || key == 379 /* ^[ */ || key == control('c')) { + if (key == Key_Escape || key == control('c')) { m_commandBuffer.clear(); enterCommandMode(); updateMiniBuffer();