From be84d40c2968d9aef34492a49a47a2d3a80bb48a Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Wed, 15 Nov 2017 21:32:29 -0500 Subject: [PATCH] Fix o/O commands --- src/core/Command.h | 1 - src/core/DefaultCommandMap.cc | 3 ++- src/gui/Window.cc | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/Command.h b/src/core/Command.h index e8960e0..5d4ff6c 100644 --- a/src/core/Command.h +++ b/src/core/Command.h @@ -24,7 +24,6 @@ public: UNDO, REDO, ENTER_INSERT_MODE, - ENTER_INSERT_MODE_NEXT_LINE, ENTER_INSERT_MODE_AFTER_CHAR, ENTER_INSERT_MODE_AFTER_LINE, ENTER_INSERT_MODE_START_OF_LINE, diff --git a/src/core/DefaultCommandMap.cc b/src/core/DefaultCommandMap.cc index 5c5ee76..fce45ee 100644 --- a/src/core/DefaultCommandMap.cc +++ b/src/core/DefaultCommandMap.cc @@ -27,7 +27,8 @@ void DefaultCommandMap::build() dcm->add("u", Command::UNDO, nullptr, false); dcm->add({JES_KEY_MODS_CTRL + 'u'}, Command::SCROLL_WINDOW_UP_HALF_SCREEN, nullptr, false); dcm->add("i", Command::ENTER_INSERT_MODE, nullptr, false); - dcm->add("o", Command::ENTER_INSERT_MODE_NEXT_LINE, nullptr, false); + dcm->add("o", Command::ENTER_INSERT_MODE_NEW_LINE_AFTER, nullptr, false); + dcm->add("O", Command::ENTER_INSERT_MODE_NEW_LINE_BEFORE, nullptr, false); dcm->add("p", Command::PUT, nullptr, false); dcm->add("P", Command::PUT_BEFORE, nullptr, false); diff --git a/src/gui/Window.cc b/src/gui/Window.cc index 0fdeaee..bc9a526 100644 --- a/src/gui/Window.cc +++ b/src/gui/Window.cc @@ -362,8 +362,6 @@ void Window::execute_command(const Command & command) case Command::ENTER_INSERT_MODE: m_focused_buffer_pane->enter_insert_mode(EnterInsertModeMode::START_OF_CHAR); break; - case Command::ENTER_INSERT_MODE_NEXT_LINE: - break; case Command::ENTER_INSERT_MODE_AFTER_CHAR: m_focused_buffer_pane->enter_insert_mode(EnterInsertModeMode::END_OF_CHAR); break;