diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Completion/Unix/Type/_signals | 13 |
2 files changed, 11 insertions, 5 deletions
@@ -1,5 +1,8 @@ 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 _git-${thirdparty} functions in $fpath that are symlinks. diff --git a/Completion/Unix/Type/_signals b/Completion/Unix/Type/_signals index 104efd4f4..df9a2f339 100644 --- a/Completion/Unix/Type/_signals +++ b/Completion/Unix/Type/_signals @@ -8,12 +8,15 @@ # # 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' if [[ -z "$last" ]]; then + first=2 last=-3 else + first=1 last=-1 fi [[ -n "$minus" ]] && minus='-' @@ -26,20 +29,20 @@ if [[ -z "$minus" ]] || local disp tmp if zstyle -t ":completion:${curcontext}:signals" prefix-hidden; then - tmp=( "${(@)signals[1,last]}" ) + tmp=( "${(@)signals[first,last]}" ) disp=(-d tmp) else disp=() fi if [[ -n "$pre" && $PREFIX = ${minus}S* ]]; then - sigs=( "${minus}SIG${(@)^signals[1,last]}" ) - (( $#disp )) && tmp=( "$tmp[@]" "${(@)signals[1,last]}" ) + sigs=( "${minus}SIG${(@)^signals[first,last]}" ) + (( $#disp )) && tmp=( "$tmp[@]" "${(@)signals[first,last]}" ) else sigs=() fi _wanted signals expl signal \ compadd "$@" "$disp[@]" -M 'm:{a-z}={A-Z}' - \ - "${minus}${(@)^signals[1,last]}" "$sigs[@]" + "${minus}${(@)^signals[first,last]}" "$sigs[@]" fi |