Commit f9281451 authored by Kimitake's avatar Kimitake Committed by hjk
Browse files

^[ should work as well as ESC key in insert mode.



Merge-request: 2157
Reviewed-by: default avatarhjk <qtc-committer@nokia.com>
parent 8abc551b
...@@ -514,7 +514,7 @@ bool FakeVimHandler::Private::wantsOverride(QKeyEvent *ev) ...@@ -514,7 +514,7 @@ bool FakeVimHandler::Private::wantsOverride(QKeyEvent *ev)
const int mods = ev->modifiers(); const int mods = ev->modifiers();
KEY_DEBUG("SHORTCUT OVERRIDE" << key << " PASSING: " << m_passing); KEY_DEBUG("SHORTCUT OVERRIDE" << key << " PASSING: " << m_passing);
if (key == Key_Escape) { if (key == Key_Escape || (mods == Qt::ControlModifier && key == Key_BracketLeft)) {
// Not sure this feels good. People often hit Esc several times // Not sure this feels good. People often hit Esc several times
if (m_visualMode == NoVisualMode && m_mode == CommandMode) if (m_visualMode == NoVisualMode && m_mode == CommandMode)
return false; return false;
...@@ -1631,7 +1631,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified, ...@@ -1631,7 +1631,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(int key, int unmodified,
EventResult FakeVimHandler::Private::handleInsertMode(int key, int, EventResult FakeVimHandler::Private::handleInsertMode(int key, int,
const QString &text) const QString &text)
{ {
if (key == Key_Escape || key == 27 || key == control('c')) { if (key == Key_Escape || key == 27 || key == control('c') ||
key == 379 /* ^[ */) {
// start with '1', as one instance was already physically inserted // start with '1', as one instance was already physically inserted
// while typing // while typing
QString data = m_lastInsertion; QString data = m_lastInsertion;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment