From f60038673295dc102fe8752d1ba84fe379845477 Mon Sep 17 00:00:00 2001 From: Tom Praschan Date: Sat, 20 Feb 2021 19:26:20 +0100 Subject: [PATCH] Fix dot command for pasting with 'P' being 'p' Change-Id: Ic491f3a198a03fd08a680e044c4e8f2f5ebe2866 Reviewed-by: hjk --- src/plugins/fakevim/fakevim_test.cpp | 2 ++ src/plugins/fakevim/fakevimhandler.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/fakevim/fakevim_test.cpp b/src/plugins/fakevim/fakevim_test.cpp index 23352887344..f8b37bd8149 100644 --- a/src/plugins/fakevim/fakevim_test.cpp +++ b/src/plugins/fakevim/fakevim_test.cpp @@ -2534,6 +2534,8 @@ void FakeVimPlugin::test_vim_copy_paste() KEYS("yy", "abc" N "abc" N X "def" N "ghi"); KEYS("\"xp", "abc" N "abc" N "def" N X "abc" N "ghi"); KEYS(".", "abc" N "abc" N "def" N "abc" N X "abc" N "ghi"); + KEYS("\"xP", "abc" N "abc" N "def" N "abc" N X "abc" N "abc" N "ghi"); + KEYS(".", "abc" N "abc" N "def" N "abc" N X "abc" N "abc" N "abc" N "ghi"); // delete to black hole register data.setText("aaa bbb ccc"); diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 112a06135dd..9526fb78377 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -4700,7 +4700,7 @@ bool FakeVimHandler::Private::handleNoSubMode(const Input &input) } else if (input.isControl('o')) { jump(-count()); } else if (input.is('p') || input.is('P') || input.isShift(Qt::Key_Insert)) { - dotCommand = QString("\"%1%2p").arg(QChar(m_register)).arg(count()); + dotCommand = QString("\"%1%2%3").arg(QChar(m_register)).arg(count()).arg(input.asChar()); pasteText(!input.is('P')); setTargetColumn();