diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-09-19 12:00:16 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-09-19 12:10:26 +0200 |
| commit | 3d9cf954e22636667a058ce96015d51ac6044d2c (patch) | |
| tree | 3d906d5609537c489a44dd93ba8533d4615fd171 /src/plugins/fakevim | |
| parent | fe1cbd0f877ee8c055911b7e8bdf8f7c6cd131d8 (diff) | |
| parent | b58dadfecc36255c0e64e0cc02e162e1595953b5 (diff) | |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
src/plugins/debugger/debuggerdialogs.cpp
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
Change-Id: I1ae77869887a8d9ef2a33439f2733315db9e0cf0
Diffstat (limited to 'src/plugins/fakevim')
| -rw-r--r-- | src/plugins/fakevim/fakevimhandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 21f218e03f5..892e6912ae3 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -4422,7 +4422,7 @@ bool FakeVimHandler::Private::handleNoSubMode(const Input &input) } else if (g.gflag && input.is('t')) { handleExCommand("tabnext"); } else if (g.gflag && input.is('T')) { - handleExCommand("tabprev"); + handleExCommand("tabprevious"); } else if (input.isControl('t')) { handleExCommand("pop"); } else if (!g.gflag && input.is('u') && !isVisualMode()) { @@ -5565,7 +5565,7 @@ bool FakeVimHandler::Private::handleExSubstituteCommand(const ExCommand &cmd) bool FakeVimHandler::Private::handleExTabNextCommand(const ExCommand &cmd) { - if (cmd.cmd != "tabnext" && cmd.cmd != "tabn") + if (!cmd.matches("tabn", "tabnext")) return false; emit q->tabNextRequested(q); @@ -5574,7 +5574,7 @@ bool FakeVimHandler::Private::handleExTabNextCommand(const ExCommand &cmd) bool FakeVimHandler::Private::handleExTabPreviousCommand(const ExCommand &cmd) { - if (cmd.cmd != "tabprevious" && cmd.cmd != "tabp") + if (!cmd.matches("tabp", "tabprevious")) return false; emit q->tabPreviousRequested(q); |