From 0e3a904b694670dd54c938a232b77b4dec0aced2 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Wed, 5 Jun 2013 14:32:48 +0200
Subject: [PATCH] FakeVim: Fix build after merge

Change-Id: Ic682320e926de0fbe44846989e45164e6db8986d
---
 src/plugins/fakevim/fakevimhandler.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 695578a9f1a..317c1e1f04f 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -2067,7 +2067,7 @@ void FakeVimHandler::Private::leaveFakeVim()
     // The command might have destroyed the editor.
     if (m_textedit || m_plaintextedit) {
         // We fake vi-style end-of-line behaviour
-        m_fakeEnd = atEndOfLine() && g.m_mode == CommandMode && !isVisualBlockMode()
+        m_fakeEnd = atEndOfLine() && g.mode == CommandMode && !isVisualBlockMode()
             && !isVisualCharMode();
 
         //QTC_ASSERT(g.mode == InsertMode || g.mode == ReplaceMode
@@ -3555,7 +3555,7 @@ bool FakeVimHandler::Private::handleMovement(const Input &input)
         } else {
             moveToNextWordStart(count, simple, true);
             // Command 'dw' deletes to the next word on the same line or to end of line.
-            if (m_submode == DeleteSubMode && count == 1) {
+            if (g.submode == DeleteSubMode && count == 1) {
                 const QTextBlock currentBlock = document()->findBlock(anchor());
                 setPosition(qMin(position(), currentBlock.position() + currentBlock.length()));
             }
@@ -7300,7 +7300,7 @@ void FakeVimHandler::Private::redo()
 void FakeVimHandler::Private::updateCursorShape()
 {
     bool thinCursor = g.mode == ExMode
-            || g.ubsubmode == SearchSubSubMode
+            || g.subsubmode == SearchSubSubMode
             || g.mode == InsertMode
             || (isVisualMode() && !isVisualCharMode());
     EDITOR(setOverwriteMode(!thinCursor));