Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-09-21 06:51:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

abbr: Erase all abbrs in one go

Browse source 
Simplifies returns, also allows erroring out without erasing anything
if an abbr name was bogus
This commit is contained in:
Fabian Homborg 2020-10-04 12:31:33 +02:00
parent 420fa68c54
commit 468c6ff0f8
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
share/functions/abbr.fish
View file

@ -97,6 +97,7 @@ end
function __fish_abbr_erase --no-scope-shadowing function __fish_abbr_erase --no-scope-shadowing
set -l ret 0 set -l ret 0
set -l abbr_var_names
for abbr_name in $argv for abbr_name in $argv
# Because of the way abbreviations are expanded there can't be any spaces in the key. # Because of the way abbreviations are expanded there can't be any spaces in the key.
set -l escaped_name (string escape -- $abbr_name) set -l escaped_name (string escape -- $abbr_name)
@ -108,13 +109,11 @@ function __fish_abbr_erase --no-scope-shadowing
set -l abbr_var_name _fish_abbr_(string escape --style=var -- $abbr_name) set -l abbr_var_name _fish_abbr_(string escape --style=var -- $abbr_name)
if not set -q $abbr_var_name set -a abbr_var_names $abbr_var_name
set ret 4 # like `set -e doesnt_exist`
end
set -e $abbr_var_name
end end
return $ret # And then erase them all in one go.
# Our return value is that of `set -e`.
set -e $abbr_var_names
end end
function __fish_abbr_rename --no-scope-shadowing function __fish_abbr_rename --no-scope-shadowing