mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-06 23:31:28 +02:00
20076: improved function using always
This commit is contained in:
parent
d591334e9d
commit
08bd15e282
1 changed files with 94 additions and 93 deletions
|
@ -62,9 +62,8 @@ zstyle -a :mime: mime-types type_files ||
|
||||||
zstyle -a :mime: mailcap cap_files ||
|
zstyle -a :mime: mailcap cap_files ||
|
||||||
cap_files=(~/.mailcap /etc/mailcap)
|
cap_files=(~/.mailcap /etc/mailcap)
|
||||||
|
|
||||||
TRAPEXIT() { unfunction mime-setup-add-type >&/dev/null; return 0; }
|
{
|
||||||
|
mime-setup-add-type() {
|
||||||
mime-setup-add-type() {
|
|
||||||
local type suffix
|
local type suffix
|
||||||
local -a array
|
local -a array
|
||||||
|
|
||||||
|
@ -90,13 +89,13 @@ mime-setup-add-type() {
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# Loop through files to find suffixes for MIME types.
|
# Loop through files to find suffixes for MIME types.
|
||||||
# Earlier entries take precedence, so the files need to be listed
|
# Earlier entries take precedence, so the files need to be listed
|
||||||
# with the user's own first. This also means pre-existing
|
# with the user's own first. This also means pre-existing
|
||||||
# values in suffix_type_map are respected.
|
# values in suffix_type_map are respected.
|
||||||
for file in $type_files; do
|
for file in $type_files; do
|
||||||
[[ -r $file ]] || continue
|
[[ -r $file ]] || continue
|
||||||
|
|
||||||
# For once we rely on the fact that read handles continuation
|
# For once we rely on the fact that read handles continuation
|
||||||
|
@ -137,8 +136,10 @@ for file in $type_files; do
|
||||||
mime-setup-add-type ${=line}
|
mime-setup-add-type ${=line}
|
||||||
fi
|
fi
|
||||||
done <$file
|
done <$file
|
||||||
done
|
done
|
||||||
|
} always {
|
||||||
|
unfunction mime-setup-add-type >&/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
# Loop through files to find handlers for types.
|
# Loop through files to find handlers for types.
|
||||||
for file in $cap_files; do
|
for file in $cap_files; do
|
||||||
|
|
Loading…
Reference in a new issue