forked from qt-creator/qt-creator
fakevim: Removed 'J' from movement commands
Change-Id: I5d3e39c6ea717008a3e555f4370827ed876affd1 Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -3050,15 +3050,6 @@ bool FakeVimHandler::Private::handleMovement(const Input &input)
|
|||||||
m_movetype = MoveLineWise;
|
m_movetype = MoveLineWise;
|
||||||
moveDown(count);
|
moveDown(count);
|
||||||
movement = "j";
|
movement = "j";
|
||||||
} else if (input.is('J')) {
|
|
||||||
moveBehindEndOfLine();
|
|
||||||
const int pos = position();
|
|
||||||
beginEditBlock();
|
|
||||||
if (m_submode == NoSubMode)
|
|
||||||
joinLines(count, m_gflag);
|
|
||||||
endEditBlock();
|
|
||||||
setPosition(pos);
|
|
||||||
setDotCommand("%1J", count);
|
|
||||||
} else if (input.is('k') || input.isKey(Key_Up) || input.isControl('p')) {
|
} else if (input.is('k') || input.isKey(Key_Up) || input.isControl('p')) {
|
||||||
m_movetype = MoveLineWise;
|
m_movetype = MoveLineWise;
|
||||||
moveUp(count);
|
moveUp(count);
|
||||||
@@ -3426,6 +3417,15 @@ bool FakeVimHandler::Private::handleNoSubMode(const Input &input)
|
|||||||
enterInsertMode();
|
enterInsertMode();
|
||||||
} else if (input.isControl('i')) {
|
} else if (input.isControl('i')) {
|
||||||
jump(count());
|
jump(count());
|
||||||
|
} else if (input.is('J')) {
|
||||||
|
moveBehindEndOfLine();
|
||||||
|
const int pos = position();
|
||||||
|
beginEditBlock();
|
||||||
|
if (m_submode == NoSubMode)
|
||||||
|
joinLines(count, m_gflag);
|
||||||
|
endEditBlock();
|
||||||
|
setPosition(pos);
|
||||||
|
setDotCommand("%1J", count);
|
||||||
} else if (input.isControl('l')) {
|
} else if (input.isControl('l')) {
|
||||||
// screen redraw. should not be needed
|
// screen redraw. should not be needed
|
||||||
} else if (input.is('m')) {
|
} else if (input.is('m')) {
|
||||||
|
|||||||
Reference in New Issue
Block a user