github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-22 23:35:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimize history search reset checking

Browse Source 
`history_search.active()` is an atomic read, whereas
`command_ends_history_search(..)` is a little bit heavier.
This commit is contained in:
Mahmoud Al-Qudsi 2019-06-08 21:06:15 -05:00
parent be97499106
commit c9a77bb474
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/reader.cpp
View File

@ -3260,10 +3260,10 @@ maybe_t<wcstring> reader_data_t::readline(int nchars_or_0) {
handle_readline_command(readline_cmd, rls); handle_readline_command(readline_cmd, rls);
if (command_ends_history_search(readline_cmd)) { if (history_search.active() && command_ends_history_search(readline_cmd)) {
// "cancel" means to abort the whole thing, other ending commands mean to finish the // "cancel" means to abort the whole thing, other ending commands mean to finish the
// search. // search.
if (history_search.active() && readline_cmd == rl::cancel) { if (readline_cmd == rl::cancel) {
history_search.go_to_end(); history_search.go_to_end();
update_command_line_from_history_search(); update_command_line_from_history_search();
} }