github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-30 14:24:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

simplify history function

Browse Source 
The fix for #4232 allows us to simplify the `history` function slightly.
This commit is contained in:
Kurtis Rader 2017-07-21 16:25:03 -07:00
parent f3130ce70b
commit d068f846e8
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
share/functions/history.fish
View File

@ -48,12 +48,6 @@ function history --description "display or manipulate interactive command histor
set show_time --show-time set show_time --show-time
end end
set -q _flag_null
and set -l null --null
set -q _flag_case_sensitive
and set -l case_sensitive --case-sensitive
set -q _flag_prefix set -q _flag_prefix
and set -l search_mode --prefix and set -l search_mode --prefix
set -q _flag_contains set -q _flag_contains
@ -96,9 +90,9 @@ function history --description "display or manipulate interactive command histor
set -l pager less set -l pager less
set -q PAGER set -q PAGER
and set pager $PAGER and set pager $PAGER
builtin history search $search_mode $show_time $max_count $case_sensitive $null -- $argv | eval $pager builtin history search $search_mode $show_time $max_count $_flag_case_sensitive $_flag_null -- $argv | eval $pager
else else
builtin history search $search_mode $show_time $max_count $case_sensitive $null -- $argv builtin history search $search_mode $show_time $max_count $_flag_case_sensitive $_flag_null -- $argv
end end
case delete # interactively delete history case delete # interactively delete history
@ -112,14 +106,14 @@ function history --description "display or manipulate interactive command histor
and set search_mode "--contains" and set search_mode "--contains"
if test $search_mode = "--exact" if test $search_mode = "--exact"
builtin history delete $search_mode $case_sensitive $argv builtin history delete $search_mode $_flag_case_sensitive $argv
return return
end end
# TODO: Fix this so that requesting history entries with a timestamp works: # TODO: Fix this so that requesting history entries with a timestamp works:
# set -l found_items (builtin history search $search_mode $show_time -- $argv) # set -l found_items (builtin history search $search_mode $show_time -- $argv)
set -l found_items set -l found_items
builtin history search $search_mode $case_sensitive --null -- $argv | while read -lz x builtin history search $search_mode $_flag_case_sensitive --null -- $argv | while read -lz x
set found_items $found_items $x set found_items $found_items $x
end end
if set -q found_items[1] if set -q found_items[1]