From 402affa9c2efd3f965ad8635a46f697da6550ea1 Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Wed, 16 Jan 2013 19:08:29 +0100
Subject: [PATCH] FakeVim: First <Delete> is part of dot command in insert mode

Change-Id: I9324c65333c0f893541043e953456e83a9986bf7
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/plugins/fakevim/fakevim_test.cpp   | 8 ++++++++
 src/plugins/fakevim/fakevimhandler.cpp | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/plugins/fakevim/fakevim_test.cpp b/src/plugins/fakevim/fakevim_test.cpp
index 75878432464..1e9019055b3 100644
--- a/src/plugins/fakevim/fakevim_test.cpp
+++ b/src/plugins/fakevim/fakevim_test.cpp
@@ -536,6 +536,14 @@ void FakeVimPlugin::test_vim_insert()
     KEYS("2iX<delete>Y<esc>", "XYX" X "Yc" N "def");
     KEYS("0j.", "XYXYc" N "XYX" X "Yf");
 
+    data.setText("abc" N "def");
+    KEYS("i<delete>XY", "XY" X "bc" N "def");
+    KEYS("0j.", "XYbc" N "X" X "Yef");
+
+    data.setText("ab" X "c" N "def");
+    KEYS("i<bs>XY", "aXY" X "c" N "def");
+    KEYS("j.", "aXYc" N "dX" X "Yf");
+
     // insert in visual block mode
     data.setText("abc" N "d" X "ef" N "jkl" N "mno" N "pqr");
     KEYS("<c-v>2j" "2I" "XYZ<esc>", "abc" N "d" X "XYZXYZef" N "jXYZXYZkl" N "mXYZXYZno" N "pqr");
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index bb4ce54319e..30b75efab82 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -4253,9 +4253,10 @@ EventResult FakeVimHandler::Private::handleInsertMode(const Input &input)
         insert = _("<BS>");
         endEditBlock();
     } else if (input.isKey(Key_Delete)) {
-        setAnchor();
+        joinPreviousEditBlock();
         cursor().deleteChar();
         insert = _("<DELETE>");
+        endEditBlock();
     } else if (input.isKey(Key_PageDown) || input.isControl('f')) {
         removeAutomaticIndentation();
         moveDown(count() * (linesOnScreen() - 2));