diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2015-05-05 23:32:59 +0200 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2015-05-05 23:58:59 +0200 |
commit | db38e167634b6c2217eec3a5aafc37c46d9e5a8d (patch) | |
tree | daa342d423febbd3a5a7ef97053037677fab004a /Completion/Darwin/Command | |
parent | 01eea47617a6e06debdb4330f92ae69f92089fd2 (diff) | |
parent | 3c3c8d3d13fd4cf6c03f81ca8dc18a1efd561728 (diff) | |
download | zsh-db38e167634b6c2217eec3a5aafc37c46d9e5a8d.tar.gz zsh-db38e167634b6c2217eec3a5aafc37c46d9e5a8d.zip |
Merge branch 'upstream' into debian
Diffstat (limited to 'Completion/Darwin/Command')
-rw-r--r-- | Completion/Darwin/Command/_defaults | 3 | ||||
-rw-r--r-- | Completion/Darwin/Command/_fink | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Completion/Darwin/Command/_defaults b/Completion/Darwin/Command/_defaults index 7818e0379..ca5d87e65 100644 --- a/Completion/Darwin/Command/_defaults +++ b/Completion/Darwin/Command/_defaults @@ -25,8 +25,9 @@ _defaults(){ _1st_arguments=( read read-type write rename delete domains find help ) local curcontext="$curcontext" state line expl + typeset -A opt_args - _arguments -A '-*' \ + _arguments -C -A '-*' \ '(-currentHost)-host:host:_hosts' \ '(-host)-currentHost' \ '*::command:->subcmd' && return 0 diff --git a/Completion/Darwin/Command/_fink b/Completion/Darwin/Command/_fink index 55c9e8da5..04a067ec1 100644 --- a/Completion/Darwin/Command/_fink +++ b/Completion/Darwin/Command/_fink @@ -86,7 +86,7 @@ _fink(){ 'cleanup:removes obsolete package files' ) - local context state line expl + local curcontext="$curcontext" state line expl local -A opt_args _arguments \ @@ -136,8 +136,8 @@ _fink(){ '(-t --tab)'{-t,--tab}'[output the list with tabs as field delimiter]' \ '(-w --width)'{-w=,--width=}'[width of display]:number or "auto"' \ '(1 : -)'{-h,--help}'[display help text]' \ - '1: :->pkgs' && return 0 - + '1: :->pkgs' && return + if [[ "$state" == pkgs ]]; then _fink_get_packages _wanted packages expl 'package hint' compadd -a packages @@ -161,6 +161,7 @@ _fink(){ #scanpackages) #checksums) #cleanup) + *) _default ;; esac } |