From 743e1ca67e7875304908b3c73f8d3e814b2fdfce Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Tue, 4 Nov 2014 20:21:22 +0100 Subject: [PATCH] FakeVim: Don't change cursor column after 'yy' command Change-Id: I44b61dfc6a03fba242c8d9d42d483806ca9d85ce Reviewed-by: hjk --- src/plugins/fakevim/fakevim_test.cpp | 3 +++ src/plugins/fakevim/fakevimhandler.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/plugins/fakevim/fakevim_test.cpp b/src/plugins/fakevim/fakevim_test.cpp index 0f15c3ee7eb..d8eb1f80aa8 100644 --- a/src/plugins/fakevim/fakevim_test.cpp +++ b/src/plugins/fakevim/fakevim_test.cpp @@ -1862,6 +1862,9 @@ void FakeVimPlugin::test_vim_copy_paste() KEYS("yj", "ab" X "c" N "def"); data.setText("abc" N "de" X "f"); KEYS("yk", "ab" X "c" N "def"); + data.setText("ab" X "c" N "def"); + KEYS("yy", "ab" X "c" N "def"); + KEYS("2yy", "ab" X "c" N "def"); // copy empty line data.setText(X "a" N "" N "b"); diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 68e3280150f..b1d4c5bab77 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -3359,6 +3359,8 @@ void FakeVimHandler::Private::finishMovement(const QString &dotCommandMovement) if (g.rangemode == RangeLineMode) { if (isVisualModeYank) moveToStartOfLine(); + else + moveToTargetColumn(); } } setTargetColumn();