feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FakeVim: Fix build after merge

Browse Source 
Change-Id: Ic682320e926de0fbe44846989e45164e6db8986d
This commit is contained in:
Eike Ziller
2013-06-05 14:32:48 +02:00
parent a503f8bee0
commit 0e3a904b69
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/fakevim/fakevimhandler.cpp
View File

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