mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-06 23:31:28 +02:00
38577: _signals: Don't complete SIGEXIT from _kill.
This commit is contained in:
parent
713eaa055d
commit
f84a5da8c2
2 changed files with 11 additions and 5 deletions
|
@ -1,5 +1,8 @@
|
||||||
2016-06-03 Daniel Shahaf <d.s@daniel.shahaf.name>
|
2016-06-03 Daniel Shahaf <d.s@daniel.shahaf.name>
|
||||||
|
|
||||||
|
* 38577: Completion/Unix/Type/_signals: Don't complete SIGEXIT
|
||||||
|
from _kill.
|
||||||
|
|
||||||
* 38576: Completion/Unix/Command/_git: Also detect
|
* 38576: Completion/Unix/Command/_git: Also detect
|
||||||
_git-${thirdparty} functions in $fpath that are symlinks.
|
_git-${thirdparty} functions in $fpath that are symlinks.
|
||||||
|
|
||||||
|
|
|
@ -8,12 +8,15 @@
|
||||||
#
|
#
|
||||||
# A `-' or `--' as the first argument is ignored.
|
# A `-' or `--' as the first argument is ignored.
|
||||||
|
|
||||||
local expl last minus pre sigs
|
local expl minus pre sigs
|
||||||
|
local first last # keep these as strings for -z/-n tests
|
||||||
|
|
||||||
zparseopts -D -K -E 'p=minus' 'a=last' 's=pre'
|
zparseopts -D -K -E 'p=minus' 'a=last' 's=pre'
|
||||||
if [[ -z "$last" ]]; then
|
if [[ -z "$last" ]]; then
|
||||||
|
first=2
|
||||||
last=-3
|
last=-3
|
||||||
else
|
else
|
||||||
|
first=1
|
||||||
last=-1
|
last=-1
|
||||||
fi
|
fi
|
||||||
[[ -n "$minus" ]] && minus='-'
|
[[ -n "$minus" ]] && minus='-'
|
||||||
|
@ -26,20 +29,20 @@ if [[ -z "$minus" ]] ||
|
||||||
local disp tmp
|
local disp tmp
|
||||||
|
|
||||||
if zstyle -t ":completion:${curcontext}:signals" prefix-hidden; then
|
if zstyle -t ":completion:${curcontext}:signals" prefix-hidden; then
|
||||||
tmp=( "${(@)signals[1,last]}" )
|
tmp=( "${(@)signals[first,last]}" )
|
||||||
disp=(-d tmp)
|
disp=(-d tmp)
|
||||||
else
|
else
|
||||||
disp=()
|
disp=()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "$pre" && $PREFIX = ${minus}S* ]]; then
|
if [[ -n "$pre" && $PREFIX = ${minus}S* ]]; then
|
||||||
sigs=( "${minus}SIG${(@)^signals[1,last]}" )
|
sigs=( "${minus}SIG${(@)^signals[first,last]}" )
|
||||||
(( $#disp )) && tmp=( "$tmp[@]" "${(@)signals[1,last]}" )
|
(( $#disp )) && tmp=( "$tmp[@]" "${(@)signals[first,last]}" )
|
||||||
else
|
else
|
||||||
sigs=()
|
sigs=()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_wanted signals expl signal \
|
_wanted signals expl signal \
|
||||||
compadd "$@" "$disp[@]" -M 'm:{a-z}={A-Z}' - \
|
compadd "$@" "$disp[@]" -M 'm:{a-z}={A-Z}' - \
|
||||||
"${minus}${(@)^signals[1,last]}" "$sigs[@]"
|
"${minus}${(@)^signals[first,last]}" "$sigs[@]"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue