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

abbr: Don't write an error if erasing nonexisting abbrs

Browse Source 
Fixes #7376.
This commit is contained in:
Fabian Homborg
2020-10-04 12:28:12 +02:00
parent 2ab4c10c47
commit 135c5a9746
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/functions/abbr.fish
View File

@@ -109,7 +109,6 @@ 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 if not set -q $abbr_var_name
printf ( _ "%s %s: No abbreviation named %s\n" ) abbr --erase $escaped_name >&2
set ret 4 # like `set -e doesnt_exist` set ret 4 # like `set -e doesnt_exist`
end end

1
tests/checks/abbr.fish
View File

@@ -8,7 +8,6 @@ abbr | grep __abbr1
abbr --erase NOT_AN_ABBR abbr --erase NOT_AN_ABBR
abbr | grep __abbr1 abbr | grep __abbr1
# CHECK: abbr -a -U -- __abbr1 'alpha beta gamma' # CHECK: abbr -a -U -- __abbr1 'alpha beta gamma'
# CHECKERR: abbr --erase: No abbreviation named NOT_AN_ABBR
# Adding existing __abbr1 should be idempotent # Adding existing __abbr1 should be idempotent
abbr __abbr1 alpha beta gamma abbr __abbr1 alpha beta gamma