Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 13:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make control-S begin navigating the pager contents

Browse source 
In addition to showing the search field, actually allow the user to type in
it.
This commit is contained in:
ridiculousfish 2019-01-22 14:33:47 -08:00
parent 24f251e044
commit 87b7b6b2bb
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -24,6 +24,7 @@
- exec now behaves properly inside functions (#5449) - exec now behaves properly inside functions (#5449)
- while loops now evaluate to the last executed command in the loop body (or zero if the body was empty), matching POSIX semantics. - while loops now evaluate to the last executed command in the loop body (or zero if the body was empty), matching POSIX semantics.
- fish does not hang on launch when running under Cygwin/MSYS2 - fish does not hang on launch when running under Cygwin/MSYS2
- The pager-toggle-search binding (by default Control-S) now positions the cursor in the completions list.
# fish 3.0.0 (released December 28, 2018) # fish 3.0.0 (released December 28, 2018)

7
src/reader.cpp
View file

@ -2728,10 +2728,15 @@ const wchar_t *reader_readline(int nchars) {
break; break;
} }
case R_PAGER_TOGGLE_SEARCH: { case R_PAGER_TOGGLE_SEARCH: {
if (data->is_navigating_pager_contents()) { if (!data->pager.empty()) {
// Toggle search, and begin navigating if we are now searching.
bool sfs = data->pager.is_search_field_shown(); bool sfs = data->pager.is_search_field_shown();
data->pager.set_search_field_shown(!sfs); data->pager.set_search_field_shown(!sfs);
data->pager.set_fully_disclosed(true); data->pager.set_fully_disclosed(true);
if (data->pager.is_search_field_shown() &&
!data->is_navigating_pager_contents()) {
select_completion_in_direction(direction_south);
}
reader_repaint_needed(); reader_repaint_needed();
} }
break; break;