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

reader: Do the "delete" part for delete-or-exit

Browse Source 
For some reason this is supposed to do a delete-*char*.

I was assuming the function was broken and it should delete the entire
line.

Fixes #5967.
This commit is contained in:
Fabian Homborg 2019-06-26 22:53:19 +02:00
parent 22d2620716
commit d7a9bdf5c3
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/reader.cpp
View File

@ -2457,17 +2457,6 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
reader_repaint_needed();
break;
}
case rl::delete_or_exit: {
if (!command_line.text.empty()) {
command_line.position = 0;
command_line.text = L"";
update_buff_pos(&command_line, 0);
reader_repaint_needed();
} else {
reader_set_end_loop(true);
}
break;
}
case rl::cancel: {
// The only thing we can cancel right now is paging, which we handled up above.
break;
@ -2687,6 +2676,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
remove_backward();
break;
}
case rl::delete_or_exit:
case rl::delete_char: {
// Remove the current character in the character buffer and on the screen using
// syntax highlighting, etc.
@ -2694,6 +2684,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
if (el->position < el->size()) {
update_buff_pos(el, el->position + 1);
remove_backward();
} else if (c == rl::delete_or_exit) {
reader_set_end_loop(true);
}
break;
}