From 3f7bc7232ed79037c2c27a255dba974532a5076a Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 21 Sep 2019 14:31:13 -0700 Subject: [PATCH] yank_POP -> yank_pop --- src/input.cpp | 2 +- src/input_common.h | 2 +- src/reader.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/input.cpp b/src/input.cpp index c1f15ae0f..a4d293e09 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -97,7 +97,7 @@ static const input_function_metadata_t input_function_metadata[] = { {readline_cmd_t::backward_delete_char, L"backward-delete-char"}, {readline_cmd_t::kill_line, L"kill-line"}, {readline_cmd_t::yank, L"yank"}, - {readline_cmd_t::yank_POP, L"yank-pop"}, + {readline_cmd_t::yank_pop, L"yank-pop"}, {readline_cmd_t::complete, L"complete"}, {readline_cmd_t::complete_and_search, L"complete-and-search"}, {readline_cmd_t::pager_toggle_search, L"pager-toggle-search"}, diff --git a/src/input_common.h b/src/input_common.h index 4f616d116..b7d67b761 100644 --- a/src/input_common.h +++ b/src/input_common.h @@ -23,7 +23,7 @@ enum class readline_cmd_t { backward_delete_char, kill_line, yank, - yank_POP, + yank_pop, complete, complete_and_search, pager_toggle_search, diff --git a/src/reader.cpp b/src/reader.cpp index 7474dfcfe..22d6b3e42 100644 --- a/src/reader.cpp +++ b/src/reader.cpp @@ -1040,7 +1040,7 @@ static bool command_ends_paging(readline_cmd_t c, bool focused_on_search_field) case rl::backward_delete_char: case rl::kill_line: case rl::yank: - case rl::yank_POP: + case rl::yank_pop: case rl::backward_kill_line: case rl::kill_whole_line: case rl::kill_word: @@ -2650,7 +2650,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat rls.yank_len = yank_str.size(); break; } - case rl::yank_POP: { + case rl::yank_pop: { if (rls.yank_len) { for (size_t i = 0; i < rls.yank_len; i++) remove_backward(); @@ -3231,7 +3231,7 @@ maybe_t reader_data_t::readline(int nchars_or_0) { assert((event_needing_handling->is_char() || event_needing_handling->is_readline()) && "Should have a char or readline"); - if (rls.last_cmd != rl::yank && rls.last_cmd != rl::yank_POP) { + if (rls.last_cmd != rl::yank && rls.last_cmd != rl::yank_pop) { rls.yank_len = 0; }