From ea75b0d18312cd1eb8caf139413dc2a064f1d788 Mon Sep 17 00:00:00 2001 From: hluk Date: Tue, 16 Apr 2013 21:21:00 +0200 Subject: [PATCH] FakeVim: Correctly save input for macro Change-Id: I648d1ec763c8a49b6d3e1bb5fb13fe1af5ae2368 Reviewed-by: hjk --- src/plugins/fakevim/fakevimhandler.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index fba3f84500b..d9852305cc3 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -968,17 +968,23 @@ public: QString toString() const { QString key = vimKeyNames().key(m_key); + bool namedKey = !key.isEmpty(); - if (key.isEmpty()) { + if (!namedKey) { if (m_xkey == '<') key = _(""); else key = QChar(m_xkey); - } else { - if (isShift()) - key.prepend(_("S-")); - if (isControl()) - key.prepend(_("C-")); + } + + bool shift = isShift(); + bool ctrl = isControl(); + if (shift) + key.prepend(_("S-")); + if (ctrl) + key.prepend(_("C-")); + + if (namedKey || shift || ctrl) { key.prepend(QLatin1Char('<')); key.append(QLatin1Char('>')); }