github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 03:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename insert_line_above to insert_line_over

Browse Source 
This is for symmetry with insert_line_under. See #7442.
This commit is contained in:
ridiculousfish 2020-12-19 14:31:33 -08:00
parent 2d2efc8b2e
commit 90f4c458e5
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/functions/fish_vi_key_bindings.fish
View File

@ -81,7 +81,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
bind -s --preset -m insert \n execute bind -s --preset -m insert \n execute
bind -s --preset -m insert \r execute bind -s --preset -m insert \r execute
bind -s --preset -m insert o insert-line-under repaint-mode bind -s --preset -m insert o insert-line-under repaint-mode
bind -s --preset -m insert O insert-line-above repaint-mode bind -s --preset -m insert O insert-line-over repaint-mode
bind -s --preset -m insert i repaint-mode bind -s --preset -m insert i repaint-mode
bind -s --preset -m insert I beginning-of-line repaint-mode bind -s --preset -m insert I beginning-of-line repaint-mode
bind -s --preset -m insert a forward-single-char repaint-mode bind -s --preset -m insert a forward-single-char repaint-mode

2
src/input.cpp
View File

@ -141,7 +141,7 @@ static const input_function_metadata_t input_function_metadata[] = {
{readline_cmd_t::end_selection, L"end-selection"}, {readline_cmd_t::end_selection, L"end-selection"},
{readline_cmd_t::kill_selection, L"kill-selection"}, {readline_cmd_t::kill_selection, L"kill-selection"},
{readline_cmd_t::insert_line_under, L"insert-line-under"}, {readline_cmd_t::insert_line_under, L"insert-line-under"},
{readline_cmd_t::insert_line_above, L"insert-line-above"}, {readline_cmd_t::insert_line_over, L"insert-line-over"},
{readline_cmd_t::forward_jump, L"forward-jump"}, {readline_cmd_t::forward_jump, L"forward-jump"},
{readline_cmd_t::backward_jump, L"backward-jump"}, {readline_cmd_t::backward_jump, L"backward-jump"},
{readline_cmd_t::forward_jump_till, L"forward-jump-till"}, {readline_cmd_t::forward_jump_till, L"forward-jump-till"},

2
src/input_common.h
View File

@ -66,7 +66,7 @@ enum class readline_cmd_t {
end_selection, end_selection,
kill_selection, kill_selection,
insert_line_under, insert_line_under,
insert_line_above, insert_line_over,
forward_jump, forward_jump,
backward_jump, backward_jump,
forward_jump_till, forward_jump_till,

2
src/reader.cpp
View File

@ -3590,7 +3590,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
} }
break; break;
} }
case rl::insert_line_above: { case rl::insert_line_over: {
editable_line_t *el = active_edit_line(); editable_line_t *el = active_edit_line();
while (el->position() > 0 && el->text().at(el->position() - 1) != L'\n') { while (el->position() > 0 && el->text().at(el->position() - 1) != L'\n') {
update_buff_pos(el, el->position() - 1); update_buff_pos(el, el->position() - 1);