From 6f58124007b4813c99f6d1dda0cd544ddf2684b0 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 6 Jul 2010 16:38:12 +0200
Subject: [PATCH] fakevim: fix mark positions after <Delete> (cherry picked
 from commit 7ccf903ee3d9da4a104310ed423130857d59d91b)

---
 src/plugins/fakevim/fakevimhandler.cpp | 37 +++++++++++++++-----------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index c8ba4f46f74..9f8a0e32307 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -2035,22 +2035,25 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
         m_opcount = m_mvcount;
         m_mvcount.clear();
         m_submode = DeleteSubMode;
-    } else if ((input.is('d') || input.is('x')) && isVisualCharMode()) {
-        leaveVisualMode();
-        m_submode = DeleteSubMode;
-        finishMovement();
-    } else if ((input.is('d') || input.is('x')) && isVisualLineMode()) {
-        leaveVisualMode();
-        m_rangemode = RangeLineMode;
-        yankText(currentRange(), m_register);
-        removeText(currentRange());
-        handleStartOfLine();
-    } else if ((input.is('d') || input.is('x')) && isVisualBlockMode()) {
-        leaveVisualMode();
-        m_rangemode = RangeBlockMode;
-        yankText(currentRange(), m_register);
-        removeText(currentRange());
-        setPosition(qMin(position(), anchor()));
+    } else if ((input.is('d') || input.is('x') || input.isKey(Key_Delete))
+            && isVisualMode()) {
+        if (isVisualCharMode()) {
+            leaveVisualMode();
+            m_submode = DeleteSubMode;
+            finishMovement();
+        } else if (isVisualLineMode()) {
+            leaveVisualMode();
+            m_rangemode = RangeLineMode;
+            yankText(currentRange(), m_register);
+            removeText(currentRange());
+            handleStartOfLine();
+        } else if (isVisualBlockMode()) {
+            leaveVisualMode();
+            m_rangemode = RangeBlockMode;
+            yankText(currentRange(), m_register);
+            removeText(currentRange());
+            setPosition(qMin(position(), anchor()));
+        }
     } else if (input.is('D') && isNoVisualMode()) {
         if (atEndOfLine())
             moveLeft();
@@ -2486,6 +2489,8 @@ EventResult FakeVimHandler::Private::handleCommandMode(const Input &input)
         setAnchor();
         moveRight(qMin(1, rightDist()));
         removeText(currentRange());
+        if (atEndOfLine())
+            moveLeft();
     } else if (input.isKey(Key_BracketLeft) || input.isKey(Key_BracketRight)) {
 
     } else if (input.isControl(Key_BracketRight)) {