diff options
Diffstat (limited to 'Completion')
-rw-r--r-- | Completion/Base/.distfiles | 2 | ||||
-rw-r--r-- | Completion/Base/_arguments | 6 | ||||
-rw-r--r-- | Completion/Commands/.distfiles | 2 | ||||
-rw-r--r-- | Completion/Debian/.distfiles | 2 | ||||
-rw-r--r-- | Completion/Debian/_apt | 5 | ||||
-rw-r--r-- | Completion/User/.distfiles | 12 | ||||
-rw-r--r-- | Completion/User/_man | 10 | ||||
-rw-r--r-- | Completion/User/_patch | 2 |
8 files changed, 18 insertions, 23 deletions
diff --git a/Completion/Base/.distfiles b/Completion/Base/.distfiles index 13e60b400..1c2c49fa2 100644 --- a/Completion/Base/.distfiles +++ b/Completion/Base/.distfiles @@ -2,6 +2,6 @@ DISTFILES_SRC=' .distfiles _arguments _brace_parameter _command_names _condition _default _equal _first - _math _parameter _precommand _redirect _subscript + _math _parameter _precommand _redirect _regex_arguments _subscript _tilde _values _vars ' diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments index 808bfc2ab..7d5aa9ca9 100644 --- a/Completion/Base/_arguments +++ b/Completion/Base/_arguments @@ -561,7 +561,7 @@ while [[ cur -gt 0 ]]; do uns="${ws[1][2,-1]}" if [[ -n "$uns" ]]; then - uns="${(@j::)${(M@)${(v)=xors[(I)${ws[1][1]}[$uns]]}:#??}#[-+]}" + uns="${(@j::)${(v)=xors[(I)${ws[1][1]}[$uns]]}#[-+]}" if [[ -n "$uns" ]]; then tmp=( "opts[${(@)^opts[(I)${ws[1][1]}[$uns]]}]" @@ -677,11 +677,11 @@ if [[ -z "$def" || "$def" = :* ]]; then done fi - [[ -n "$sopts" && -n "$opt" && "$PREFIX" = [-+]${~soptseq}[$sopts] ]] && + [[ -n "$sopts" && -n "$opt" && "$PREFIX" = [-+]${~soptseq}[$sopts] ]] && \ uns="${PREFIX[2,-1]}" if [[ -n "$uns" ]]; then - uns="${(@j::)${(M@)${(v)=xors[(I)${ws[1][1]}[$uns]]}:#??}#[-+]}" + uns="${(@j::)${(v)=xors[(I)${ws[1][1]}[$uns]]}#[-+]}" if [[ -n "$uns" ]]; then tmp=( "opts[${(@)^opts[(I)${pre[1]}[$uns]]}]" diff --git a/Completion/Commands/.distfiles b/Completion/Commands/.distfiles index 7fef35230..74072b5de 100644 --- a/Completion/Commands/.distfiles +++ b/Completion/Commands/.distfiles @@ -1,4 +1,4 @@ DISTFILES_SRC=' .distfiles _correct_filename _correct_word _expand_word - _history_complete_word _read_comp _most_recent_file + _history_complete_word _read_comp _most_recent_file _verbose_list ' diff --git a/Completion/Debian/.distfiles b/Completion/Debian/.distfiles index b2064b60c..fd37cf014 100644 --- a/Completion/Debian/.distfiles +++ b/Completion/Debian/.distfiles @@ -1,5 +1,5 @@ DISTFILES_SRC=' .distfiles - _apt-get _deb_packages + _apt _deb_packages ' diff --git a/Completion/Debian/_apt b/Completion/Debian/_apt index 7654ce1fe..fe909bda3 100644 --- a/Completion/Debian/_apt +++ b/Completion/Debian/_apt @@ -374,8 +374,6 @@ _apt-get () { --no-upgrade:bool \ --force-yes:bool \ --print-uris:bool \ - --purge:bool \ - --list-cleanup:bool \ -c,--config-file:configfile \ -o,--option:arbitem \ -- \ @@ -427,8 +425,7 @@ _apt-cache () { /$'check\0' \| \ /$'search\0' \| \ /$'show\0' \| \ - /$'depends\0' \| \ - /"[]" !'compadd "$expl_action[@]" help add gencaches showpkg stats dump dumpavail unmet check search show depends' + /"[]" !'compadd "$expl_action[@]" help add gencaches showpkg stats dump dumpavail unmet check search show' _apt-cache () { local expl_action expl_packages expl_pkg_cache expl_src_cache diff --git a/Completion/User/.distfiles b/Completion/User/.distfiles index caf25f120..b17ca6488 100644 --- a/Completion/User/.distfiles +++ b/Completion/User/.distfiles @@ -1,9 +1,9 @@ DISTFILES_SRC=' .distfiles - _a2ps _bunzip2 _bzip2 _chown _compress _configure _dd _dir_list _dvi - _exec_funcs _find _gdb _gprof _groups _gs _gs_name _gunzip _gv _gzip - _hosts _lynx _make _man _mh _nslookup _patch _pbm _pdf _perl_basepods - _perl_builtin_funcs _perl_modules _perldoc _ps _pspdf _rcs _rlogin _sh - _strip _stty _su _tar _tar_archive _tex _uncompress _urls _use_lo - _users _xargs + _a2ps _bison _bunzip2 _bzip2 _chown _compress _configure _cvs _dd + _dir_list _dvi _find _flex _gdb _gprof _groups _gs _gunzip _gv _gzip + _hosts _ispell _lynx _make _man _man.old _mh _mount _nslookup _patch + _pbm _pdf _perl_basepods _perl_builtin_funcs _perl_modules _perldoc _ps + _pspdf _rcs _rlogin _sh _socket _ssh _strip _stty _su _tar _tar_archive + _telnet _tex _tiff _uncompress _urls _use_lo _users _xargs _yodl _yp ' diff --git a/Completion/User/_man b/Completion/User/_man index 8ae64e239..ebe9a432e 100644 --- a/Completion/User/_man +++ b/Completion/User/_man @@ -1,6 +1,6 @@ #compdef man -setopt localoptions rcexpandparam extendedglob +setopt localoptions rcexpandparam local rep expl star approx @@ -14,14 +14,12 @@ if [[ -n $_comp_correct ]]; then approx="(#a${_comp_correct})" fi -# `sman' is the SGML manual directory for Solaris 7. - if [[ $words[2] = (<->*|ln) ]]; then rep=( - $manpath/(sman|man|cat)${words[2]}/${~approx}$PREFIX${~star}$SUFFIX.<->*(N:t) ) + $manpath/(man|cat)${words[2]}/${~approx}$PREFIX${~star}$SUFFIX.<->*(N:t:r) ) else - rep=( $manpath/(sman|man|cat)*/${~approx}$PREFIX${~star}$SUFFIX.<->*(N:t) ) + rep=( $manpath/(man|cat)*/${~approx}$PREFIX${~star}$SUFFIX.<->*(N:t:r) ) fi _description expl 'manual page' -(( $#rep )) && compadd "$expl[@]" - ${rep%%.[^.]##(.gz|)} +(( $#rep )) && compadd "$expl[@]" - $rep diff --git a/Completion/User/_patch b/Completion/User/_patch index 2b6ad5f94..6be2afd62 100644 --- a/Completion/User/_patch +++ b/Completion/User/_patch @@ -24,7 +24,7 @@ _arguments -s \ '(--ifdef)-D+:name:' \ '(--version-control)-V+:version control style:(simple numbered existing)' \ '(--prefix)-B+:backup path prefix:' \ - '(--suffix)-b+:backup extension:' \ + '(--suffix)-b:backup extension:' \ '-Y+:backup basename prefix:_files' \ '-z+:backup file suffix:(.bak)' \ '-g+:NUM:' \ |