h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-20 05:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

fix history --delete regression

Browse Source 
The recent change to reconcile the history builtin command and function
broke an undocumented behavior of `history --delete`. This change
reinstates that behavior. It also adds an explicit `--exact` search mode
for the `--search` and `--delete` subcommands.

Fixes #3270
This commit is contained in:
Kurtis Rader
2016-07-29 21:24:26 -07:00
parent ef5d3232e4
commit 710addde16
8 changed files with 156 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/reader.cpp
View File

@@ -2873,11 +2873,15 @@ const wchar_t *reader_readline(int nchars) {
data->history_search = history_search_t(*data->history, data->search_buff,
HISTORY_SEARCH_TYPE_CONTAINS);
// Skip the autosuggestion as history unless it was truncated.
// Always skip history entries that exactly match what has been typed so far.
wcstring_list_t skip_list;
skip_list.push_back(data->command_line.text);
const wcstring &suggest = data->autosuggestion;
if (!suggest.empty() && !data->screen.autosuggestion_is_truncated) {
data->history_search.skip_matches(wcstring_list_t(&suggest, 1 + &suggest));
// Also skip the autosuggestion in the history unless it was truncated.
skip_list.push_back(suggest);
}
data->history_search.skip_matches(skip_list);
}
switch (data->search_mode) {